diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf86b44..ccb762c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.5.7] - 2021-04-07
+### Unreleased
+- The Version Control package will be expanding to include both Collaborate and Plastic SCM version control interfaces. This release is preparing for that move and contains no new functionality or bug fixes for Collaborate.
+### Changed
+- Collaborate Package renamed to Version Control with changes to package display name and description.
+### Fixed
+- Fixed NPE when updating the version of the Collab package.
+
 ## [1.3.9] - 2020-07-13
 ### Fixed
 - Unnecessary use of texture compression in icons that slowed down platform switching
@@ -20,7 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 - Bulk revert is now supported.
 - Collab is blocked in play mode.
-## Fixed
+### Fixed
 - Fixed services window's links to open Collab.
 
 ## [1.3.6] - 2020-01-21
diff --git a/Documentation~/unity-cloud-collaborate.md b/Documentation~/unity-cloud-collaborate.md
index 9584138..45e93ab 100644
--- a/Documentation~/unity-cloud-collaborate.md
+++ b/Documentation~/unity-cloud-collaborate.md
@@ -1,5 +1,6 @@
-# About Unity Collaborate
-
-Collaborate is a simple way for teams to save, share, and sync their Unity project.
-
-Please refer to the online documentation [here.](https://docs.unity3d.com/Manual/UnityCollaborate.html)
+# About Version Control
+The Version Control package provides an in-editor interface for teams to work with Collaborate and Plastic SCM (coming soon).
+## Collaborate
+Collaborate makes it easy for teams to save, share, and sync their Unity projects with others, regardless of location. It is cloud enabled and built directly into Unity. Please refer to the online documentation for Unity Collaborate [here.](https://docs.unity3d.com/Manual/UnityCollaborate.html)
+## Plastic SCM
+Plastic SCM Plugin for Unity (beta) is a free Unity plugin that gives you the ability to use Plastic SCM, a leading version control solution, directly in Unity. It is currently available on the Unity Asset Store but will be moving to this package in an upcoming release.
diff --git a/Editor/Collaborate.meta b/Editor/Collaborate.meta
new file mode 100644
index 0000000..2aa1c6e
--- /dev/null
+++ b/Editor/Collaborate.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2dccfb4f31ae9ba44b41452beaa34658
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/Assets.meta b/Editor/Collaborate/Assets.meta
similarity index 100%
rename from Editor/Assets.meta
rename to Editor/Collaborate/Assets.meta
diff --git a/Editor/Assets/Icons.meta b/Editor/Collaborate/Assets/Icons.meta
similarity index 100%
rename from Editor/Assets/Icons.meta
rename to Editor/Collaborate/Assets/Icons.meta
diff --git a/Editor/Assets/Icons/README.md b/Editor/Collaborate/Assets/Icons/README.md
similarity index 100%
rename from Editor/Assets/Icons/README.md
rename to Editor/Collaborate/Assets/Icons/README.md
diff --git a/Editor/Assets/Icons/README.md.meta b/Editor/Collaborate/Assets/Icons/README.md.meta
similarity index 100%
rename from Editor/Assets/Icons/README.md.meta
rename to Editor/Collaborate/Assets/Icons/README.md.meta
diff --git a/Editor/Assets/Icons/added-file-dark.png b/Editor/Collaborate/Assets/Icons/added-file-dark.png
similarity index 100%
rename from Editor/Assets/Icons/added-file-dark.png
rename to Editor/Collaborate/Assets/Icons/added-file-dark.png
diff --git a/Editor/Assets/Icons/added-file-dark.png.meta b/Editor/Collaborate/Assets/Icons/added-file-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/added-file-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/added-file-dark.png.meta
diff --git a/Editor/Assets/Icons/added-file-dark@2x.png b/Editor/Collaborate/Assets/Icons/added-file-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/added-file-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/added-file-dark@2x.png
diff --git a/Editor/Assets/Icons/added-file-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/added-file-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/added-file-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/added-file-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/added-file-light.png b/Editor/Collaborate/Assets/Icons/added-file-light.png
similarity index 100%
rename from Editor/Assets/Icons/added-file-light.png
rename to Editor/Collaborate/Assets/Icons/added-file-light.png
diff --git a/Editor/Assets/Icons/added-file-light.png.meta b/Editor/Collaborate/Assets/Icons/added-file-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/added-file-light.png.meta
rename to Editor/Collaborate/Assets/Icons/added-file-light.png.meta
diff --git a/Editor/Assets/Icons/added-file-light@2x.png b/Editor/Collaborate/Assets/Icons/added-file-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/added-file-light@2x.png
rename to Editor/Collaborate/Assets/Icons/added-file-light@2x.png
diff --git a/Editor/Assets/Icons/added-file-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/added-file-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/added-file-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/added-file-light@2x.png.meta
diff --git a/Editor/Assets/Icons/back-dark.png b/Editor/Collaborate/Assets/Icons/back-dark.png
similarity index 100%
rename from Editor/Assets/Icons/back-dark.png
rename to Editor/Collaborate/Assets/Icons/back-dark.png
diff --git a/Editor/Assets/Icons/back-dark.png.meta b/Editor/Collaborate/Assets/Icons/back-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/back-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/back-dark.png.meta
diff --git a/Editor/Assets/Icons/back-dark@2x.png b/Editor/Collaborate/Assets/Icons/back-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/back-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/back-dark@2x.png
diff --git a/Editor/Assets/Icons/back-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/back-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/back-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/back-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/back-light.png b/Editor/Collaborate/Assets/Icons/back-light.png
similarity index 100%
rename from Editor/Assets/Icons/back-light.png
rename to Editor/Collaborate/Assets/Icons/back-light.png
diff --git a/Editor/Assets/Icons/back-light.png.meta b/Editor/Collaborate/Assets/Icons/back-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/back-light.png.meta
rename to Editor/Collaborate/Assets/Icons/back-light.png.meta
diff --git a/Editor/Assets/Icons/back-light@2x.png b/Editor/Collaborate/Assets/Icons/back-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/back-light@2x.png
rename to Editor/Collaborate/Assets/Icons/back-light@2x.png
diff --git a/Editor/Assets/Icons/back-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/back-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/back-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/back-light@2x.png.meta
diff --git a/Editor/Assets/Icons/choose-mine-dark.png b/Editor/Collaborate/Assets/Icons/choose-mine-dark.png
similarity index 100%
rename from Editor/Assets/Icons/choose-mine-dark.png
rename to Editor/Collaborate/Assets/Icons/choose-mine-dark.png
diff --git a/Editor/Assets/Icons/choose-mine-dark.png.meta b/Editor/Collaborate/Assets/Icons/choose-mine-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/choose-mine-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/choose-mine-dark.png.meta
diff --git a/Editor/Assets/Icons/choose-mine-dark@2x.png b/Editor/Collaborate/Assets/Icons/choose-mine-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/choose-mine-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/choose-mine-dark@2x.png
diff --git a/Editor/Assets/Icons/choose-mine-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/choose-mine-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/choose-mine-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/choose-mine-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/choose-mine-light.png b/Editor/Collaborate/Assets/Icons/choose-mine-light.png
similarity index 100%
rename from Editor/Assets/Icons/choose-mine-light.png
rename to Editor/Collaborate/Assets/Icons/choose-mine-light.png
diff --git a/Editor/Assets/Icons/choose-mine-light.png.meta b/Editor/Collaborate/Assets/Icons/choose-mine-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/choose-mine-light.png.meta
rename to Editor/Collaborate/Assets/Icons/choose-mine-light.png.meta
diff --git a/Editor/Assets/Icons/choose-mine-light@2x.png b/Editor/Collaborate/Assets/Icons/choose-mine-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/choose-mine-light@2x.png
rename to Editor/Collaborate/Assets/Icons/choose-mine-light@2x.png
diff --git a/Editor/Assets/Icons/choose-mine-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/choose-mine-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/choose-mine-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/choose-mine-light@2x.png.meta
diff --git a/Editor/Assets/Icons/choose-remote-dark.png b/Editor/Collaborate/Assets/Icons/choose-remote-dark.png
similarity index 100%
rename from Editor/Assets/Icons/choose-remote-dark.png
rename to Editor/Collaborate/Assets/Icons/choose-remote-dark.png
diff --git a/Editor/Assets/Icons/choose-remote-dark.png.meta b/Editor/Collaborate/Assets/Icons/choose-remote-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/choose-remote-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/choose-remote-dark.png.meta
diff --git a/Editor/Assets/Icons/choose-remote-dark@2x.png b/Editor/Collaborate/Assets/Icons/choose-remote-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/choose-remote-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/choose-remote-dark@2x.png
diff --git a/Editor/Assets/Icons/choose-remote-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/choose-remote-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/choose-remote-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/choose-remote-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/choose-remote-light.png b/Editor/Collaborate/Assets/Icons/choose-remote-light.png
similarity index 100%
rename from Editor/Assets/Icons/choose-remote-light.png
rename to Editor/Collaborate/Assets/Icons/choose-remote-light.png
diff --git a/Editor/Assets/Icons/choose-remote-light.png.meta b/Editor/Collaborate/Assets/Icons/choose-remote-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/choose-remote-light.png.meta
rename to Editor/Collaborate/Assets/Icons/choose-remote-light.png.meta
diff --git a/Editor/Assets/Icons/choose-remote-light@2x.png b/Editor/Collaborate/Assets/Icons/choose-remote-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/choose-remote-light@2x.png
rename to Editor/Collaborate/Assets/Icons/choose-remote-light@2x.png
diff --git a/Editor/Assets/Icons/choose-remote-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/choose-remote-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/choose-remote-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/choose-remote-light@2x.png.meta
diff --git a/Editor/Assets/Icons/clear-dark.png b/Editor/Collaborate/Assets/Icons/clear-dark.png
similarity index 100%
rename from Editor/Assets/Icons/clear-dark.png
rename to Editor/Collaborate/Assets/Icons/clear-dark.png
diff --git a/Editor/Assets/Icons/clear-dark.png.meta b/Editor/Collaborate/Assets/Icons/clear-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/clear-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/clear-dark.png.meta
diff --git a/Editor/Assets/Icons/clear-dark@2x.png b/Editor/Collaborate/Assets/Icons/clear-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/clear-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/clear-dark@2x.png
diff --git a/Editor/Assets/Icons/clear-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/clear-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/clear-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/clear-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/clear-light.png b/Editor/Collaborate/Assets/Icons/clear-light.png
similarity index 100%
rename from Editor/Assets/Icons/clear-light.png
rename to Editor/Collaborate/Assets/Icons/clear-light.png
diff --git a/Editor/Assets/Icons/clear-light.png.meta b/Editor/Collaborate/Assets/Icons/clear-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/clear-light.png.meta
rename to Editor/Collaborate/Assets/Icons/clear-light.png.meta
diff --git a/Editor/Assets/Icons/clear-light@2x.png b/Editor/Collaborate/Assets/Icons/clear-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/clear-light@2x.png
rename to Editor/Collaborate/Assets/Icons/clear-light@2x.png
diff --git a/Editor/Assets/Icons/clear-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/clear-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/clear-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/clear-light@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-available-changes-dark.png b/Editor/Collaborate/Assets/Icons/collaborate-available-changes-dark.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-available-changes-dark.png
rename to Editor/Collaborate/Assets/Icons/collaborate-available-changes-dark.png
diff --git a/Editor/Assets/Icons/collaborate-available-changes-dark.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-available-changes-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-available-changes-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-available-changes-dark.png.meta
diff --git a/Editor/Assets/Icons/collaborate-available-changes-dark@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-available-changes-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-available-changes-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-available-changes-dark@2x.png
diff --git a/Editor/Assets/Icons/collaborate-available-changes-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-available-changes-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-available-changes-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-available-changes-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-available-changes-light.png b/Editor/Collaborate/Assets/Icons/collaborate-available-changes-light.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-available-changes-light.png
rename to Editor/Collaborate/Assets/Icons/collaborate-available-changes-light.png
diff --git a/Editor/Assets/Icons/collaborate-available-changes-light.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-available-changes-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-available-changes-light.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-available-changes-light.png.meta
diff --git a/Editor/Assets/Icons/collaborate-available-changes-light@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-available-changes-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-available-changes-light@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-available-changes-light@2x.png
diff --git a/Editor/Assets/Icons/collaborate-available-changes-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-available-changes-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-available-changes-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-available-changes-light@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-dark.png b/Editor/Collaborate/Assets/Icons/collaborate-dark.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-dark.png
rename to Editor/Collaborate/Assets/Icons/collaborate-dark.png
diff --git a/Editor/Assets/Icons/collaborate-dark.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-dark.png.meta
diff --git a/Editor/Assets/Icons/collaborate-dark@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-dark@2x.png
diff --git a/Editor/Assets/Icons/collaborate-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-done-dark.png b/Editor/Collaborate/Assets/Icons/collaborate-done-dark.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-done-dark.png
rename to Editor/Collaborate/Assets/Icons/collaborate-done-dark.png
diff --git a/Editor/Assets/Icons/collaborate-done-dark.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-done-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-done-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-done-dark.png.meta
diff --git a/Editor/Assets/Icons/collaborate-done-dark@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-done-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-done-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-done-dark@2x.png
diff --git a/Editor/Assets/Icons/collaborate-done-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-done-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-done-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-done-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-done-light.png b/Editor/Collaborate/Assets/Icons/collaborate-done-light.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-done-light.png
rename to Editor/Collaborate/Assets/Icons/collaborate-done-light.png
diff --git a/Editor/Assets/Icons/collaborate-done-light.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-done-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-done-light.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-done-light.png.meta
diff --git a/Editor/Assets/Icons/collaborate-done-light@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-done-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-done-light@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-done-light@2x.png
diff --git a/Editor/Assets/Icons/collaborate-done-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-done-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-done-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-done-light@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-error-dark.png b/Editor/Collaborate/Assets/Icons/collaborate-error-dark.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-error-dark.png
rename to Editor/Collaborate/Assets/Icons/collaborate-error-dark.png
diff --git a/Editor/Assets/Icons/collaborate-error-dark.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-error-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-error-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-error-dark.png.meta
diff --git a/Editor/Assets/Icons/collaborate-error-dark@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-error-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-error-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-error-dark@2x.png
diff --git a/Editor/Assets/Icons/collaborate-error-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-error-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-error-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-error-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-error-light.png b/Editor/Collaborate/Assets/Icons/collaborate-error-light.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-error-light.png
rename to Editor/Collaborate/Assets/Icons/collaborate-error-light.png
diff --git a/Editor/Assets/Icons/collaborate-error-light.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-error-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-error-light.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-error-light.png.meta
diff --git a/Editor/Assets/Icons/collaborate-error-light@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-error-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-error-light@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-error-light@2x.png
diff --git a/Editor/Assets/Icons/collaborate-error-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-error-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-error-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-error-light@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-incoming-dark.png b/Editor/Collaborate/Assets/Icons/collaborate-incoming-dark.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-incoming-dark.png
rename to Editor/Collaborate/Assets/Icons/collaborate-incoming-dark.png
diff --git a/Editor/Assets/Icons/collaborate-incoming-dark.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-incoming-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-incoming-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-incoming-dark.png.meta
diff --git a/Editor/Assets/Icons/collaborate-incoming-dark@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-incoming-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-incoming-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-incoming-dark@2x.png
diff --git a/Editor/Assets/Icons/collaborate-incoming-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-incoming-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-incoming-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-incoming-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-incoming-light.png b/Editor/Collaborate/Assets/Icons/collaborate-incoming-light.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-incoming-light.png
rename to Editor/Collaborate/Assets/Icons/collaborate-incoming-light.png
diff --git a/Editor/Assets/Icons/collaborate-incoming-light.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-incoming-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-incoming-light.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-incoming-light.png.meta
diff --git a/Editor/Assets/Icons/collaborate-incoming-light@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-incoming-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-incoming-light@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-incoming-light@2x.png
diff --git a/Editor/Assets/Icons/collaborate-incoming-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-incoming-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-incoming-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-incoming-light@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-light.png b/Editor/Collaborate/Assets/Icons/collaborate-light.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-light.png
rename to Editor/Collaborate/Assets/Icons/collaborate-light.png
diff --git a/Editor/Assets/Icons/collaborate-light.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-light.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-light.png.meta
diff --git a/Editor/Assets/Icons/collaborate-light@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-light@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-light@2x.png
diff --git a/Editor/Assets/Icons/collaborate-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-light@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-offline-dark.png b/Editor/Collaborate/Assets/Icons/collaborate-offline-dark.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-offline-dark.png
rename to Editor/Collaborate/Assets/Icons/collaborate-offline-dark.png
diff --git a/Editor/Assets/Icons/collaborate-offline-dark.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-offline-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-offline-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-offline-dark.png.meta
diff --git a/Editor/Assets/Icons/collaborate-offline-dark@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-offline-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-offline-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-offline-dark@2x.png
diff --git a/Editor/Assets/Icons/collaborate-offline-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-offline-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-offline-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-offline-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-offline-light.png b/Editor/Collaborate/Assets/Icons/collaborate-offline-light.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-offline-light.png
rename to Editor/Collaborate/Assets/Icons/collaborate-offline-light.png
diff --git a/Editor/Assets/Icons/collaborate-offline-light.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-offline-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-offline-light.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-offline-light.png.meta
diff --git a/Editor/Assets/Icons/collaborate-offline-light@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-offline-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-offline-light@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-offline-light@2x.png
diff --git a/Editor/Assets/Icons/collaborate-offline-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-offline-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-offline-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-offline-light@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-progress-dark.png b/Editor/Collaborate/Assets/Icons/collaborate-progress-dark.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-progress-dark.png
rename to Editor/Collaborate/Assets/Icons/collaborate-progress-dark.png
diff --git a/Editor/Assets/Icons/collaborate-progress-dark.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-progress-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-progress-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-progress-dark.png.meta
diff --git a/Editor/Assets/Icons/collaborate-progress-dark@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-progress-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-progress-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-progress-dark@2x.png
diff --git a/Editor/Assets/Icons/collaborate-progress-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-progress-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-progress-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-progress-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-progress-light.png b/Editor/Collaborate/Assets/Icons/collaborate-progress-light.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-progress-light.png
rename to Editor/Collaborate/Assets/Icons/collaborate-progress-light.png
diff --git a/Editor/Assets/Icons/collaborate-progress-light.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-progress-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-progress-light.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-progress-light.png.meta
diff --git a/Editor/Assets/Icons/collaborate-progress-light@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-progress-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-progress-light@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-progress-light@2x.png
diff --git a/Editor/Assets/Icons/collaborate-progress-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-progress-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-progress-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-progress-light@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-warning-dark.png b/Editor/Collaborate/Assets/Icons/collaborate-warning-dark.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-warning-dark.png
rename to Editor/Collaborate/Assets/Icons/collaborate-warning-dark.png
diff --git a/Editor/Assets/Icons/collaborate-warning-dark.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-warning-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-warning-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-warning-dark.png.meta
diff --git a/Editor/Assets/Icons/collaborate-warning-dark@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-warning-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-warning-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-warning-dark@2x.png
diff --git a/Editor/Assets/Icons/collaborate-warning-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-warning-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-warning-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-warning-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/collaborate-warning-light.png b/Editor/Collaborate/Assets/Icons/collaborate-warning-light.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-warning-light.png
rename to Editor/Collaborate/Assets/Icons/collaborate-warning-light.png
diff --git a/Editor/Assets/Icons/collaborate-warning-light.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-warning-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-warning-light.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-warning-light.png.meta
diff --git a/Editor/Assets/Icons/collaborate-warning-light@2x.png b/Editor/Collaborate/Assets/Icons/collaborate-warning-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/collaborate-warning-light@2x.png
rename to Editor/Collaborate/Assets/Icons/collaborate-warning-light@2x.png
diff --git a/Editor/Assets/Icons/collaborate-warning-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/collaborate-warning-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/collaborate-warning-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/collaborate-warning-light@2x.png.meta
diff --git a/Editor/Assets/Icons/conflicted-file-dark.png b/Editor/Collaborate/Assets/Icons/conflicted-file-dark.png
similarity index 100%
rename from Editor/Assets/Icons/conflicted-file-dark.png
rename to Editor/Collaborate/Assets/Icons/conflicted-file-dark.png
diff --git a/Editor/Assets/Icons/conflicted-file-dark.png.meta b/Editor/Collaborate/Assets/Icons/conflicted-file-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/conflicted-file-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/conflicted-file-dark.png.meta
diff --git a/Editor/Assets/Icons/conflicted-file-dark@2x.png b/Editor/Collaborate/Assets/Icons/conflicted-file-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/conflicted-file-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/conflicted-file-dark@2x.png
diff --git a/Editor/Assets/Icons/conflicted-file-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/conflicted-file-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/conflicted-file-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/conflicted-file-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/conflicted-file-light.png b/Editor/Collaborate/Assets/Icons/conflicted-file-light.png
similarity index 100%
rename from Editor/Assets/Icons/conflicted-file-light.png
rename to Editor/Collaborate/Assets/Icons/conflicted-file-light.png
diff --git a/Editor/Assets/Icons/conflicted-file-light.png.meta b/Editor/Collaborate/Assets/Icons/conflicted-file-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/conflicted-file-light.png.meta
rename to Editor/Collaborate/Assets/Icons/conflicted-file-light.png.meta
diff --git a/Editor/Assets/Icons/conflicted-file-light@2x.png b/Editor/Collaborate/Assets/Icons/conflicted-file-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/conflicted-file-light@2x.png
rename to Editor/Collaborate/Assets/Icons/conflicted-file-light@2x.png
diff --git a/Editor/Assets/Icons/conflicted-file-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/conflicted-file-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/conflicted-file-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/conflicted-file-light@2x.png.meta
diff --git a/Editor/Assets/Icons/deleted-file-dark.png b/Editor/Collaborate/Assets/Icons/deleted-file-dark.png
similarity index 100%
rename from Editor/Assets/Icons/deleted-file-dark.png
rename to Editor/Collaborate/Assets/Icons/deleted-file-dark.png
diff --git a/Editor/Assets/Icons/deleted-file-dark.png.meta b/Editor/Collaborate/Assets/Icons/deleted-file-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/deleted-file-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/deleted-file-dark.png.meta
diff --git a/Editor/Assets/Icons/deleted-file-dark@2x.png b/Editor/Collaborate/Assets/Icons/deleted-file-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/deleted-file-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/deleted-file-dark@2x.png
diff --git a/Editor/Assets/Icons/deleted-file-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/deleted-file-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/deleted-file-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/deleted-file-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/deleted-file-light.png b/Editor/Collaborate/Assets/Icons/deleted-file-light.png
similarity index 100%
rename from Editor/Assets/Icons/deleted-file-light.png
rename to Editor/Collaborate/Assets/Icons/deleted-file-light.png
diff --git a/Editor/Assets/Icons/deleted-file-light.png.meta b/Editor/Collaborate/Assets/Icons/deleted-file-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/deleted-file-light.png.meta
rename to Editor/Collaborate/Assets/Icons/deleted-file-light.png.meta
diff --git a/Editor/Assets/Icons/deleted-file-light@2x.png b/Editor/Collaborate/Assets/Icons/deleted-file-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/deleted-file-light@2x.png
rename to Editor/Collaborate/Assets/Icons/deleted-file-light@2x.png
diff --git a/Editor/Assets/Icons/deleted-file-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/deleted-file-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/deleted-file-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/deleted-file-light@2x.png.meta
diff --git a/Editor/Assets/Icons/diff-dark.png b/Editor/Collaborate/Assets/Icons/diff-dark.png
similarity index 100%
rename from Editor/Assets/Icons/diff-dark.png
rename to Editor/Collaborate/Assets/Icons/diff-dark.png
diff --git a/Editor/Assets/Icons/diff-dark.png.meta b/Editor/Collaborate/Assets/Icons/diff-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/diff-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/diff-dark.png.meta
diff --git a/Editor/Assets/Icons/diff-dark@2x.png b/Editor/Collaborate/Assets/Icons/diff-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/diff-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/diff-dark@2x.png
diff --git a/Editor/Assets/Icons/diff-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/diff-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/diff-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/diff-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/diff-light.png b/Editor/Collaborate/Assets/Icons/diff-light.png
similarity index 100%
rename from Editor/Assets/Icons/diff-light.png
rename to Editor/Collaborate/Assets/Icons/diff-light.png
diff --git a/Editor/Assets/Icons/diff-light.png.meta b/Editor/Collaborate/Assets/Icons/diff-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/diff-light.png.meta
rename to Editor/Collaborate/Assets/Icons/diff-light.png.meta
diff --git a/Editor/Assets/Icons/diff-light@2x.png b/Editor/Collaborate/Assets/Icons/diff-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/diff-light@2x.png
rename to Editor/Collaborate/Assets/Icons/diff-light@2x.png
diff --git a/Editor/Assets/Icons/diff-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/diff-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/diff-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/diff-light@2x.png.meta
diff --git a/Editor/Assets/Icons/edited-file-dark.png b/Editor/Collaborate/Assets/Icons/edited-file-dark.png
similarity index 100%
rename from Editor/Assets/Icons/edited-file-dark.png
rename to Editor/Collaborate/Assets/Icons/edited-file-dark.png
diff --git a/Editor/Assets/Icons/edited-file-dark.png.meta b/Editor/Collaborate/Assets/Icons/edited-file-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/edited-file-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/edited-file-dark.png.meta
diff --git a/Editor/Assets/Icons/edited-file-dark@2x.png b/Editor/Collaborate/Assets/Icons/edited-file-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/edited-file-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/edited-file-dark@2x.png
diff --git a/Editor/Assets/Icons/edited-file-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/edited-file-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/edited-file-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/edited-file-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/edited-file-light.png b/Editor/Collaborate/Assets/Icons/edited-file-light.png
similarity index 100%
rename from Editor/Assets/Icons/edited-file-light.png
rename to Editor/Collaborate/Assets/Icons/edited-file-light.png
diff --git a/Editor/Assets/Icons/edited-file-light.png.meta b/Editor/Collaborate/Assets/Icons/edited-file-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/edited-file-light.png.meta
rename to Editor/Collaborate/Assets/Icons/edited-file-light.png.meta
diff --git a/Editor/Assets/Icons/edited-file-light@2x.png b/Editor/Collaborate/Assets/Icons/edited-file-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/edited-file-light@2x.png
rename to Editor/Collaborate/Assets/Icons/edited-file-light@2x.png
diff --git a/Editor/Assets/Icons/edited-file-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/edited-file-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/edited-file-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/edited-file-light@2x.png.meta
diff --git a/Editor/Assets/Icons/loading-dark.png b/Editor/Collaborate/Assets/Icons/loading-dark.png
similarity index 100%
rename from Editor/Assets/Icons/loading-dark.png
rename to Editor/Collaborate/Assets/Icons/loading-dark.png
diff --git a/Editor/Assets/Icons/loading-dark.png.meta b/Editor/Collaborate/Assets/Icons/loading-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/loading-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/loading-dark.png.meta
diff --git a/Editor/Assets/Icons/loading-dark@2x.png b/Editor/Collaborate/Assets/Icons/loading-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/loading-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/loading-dark@2x.png
diff --git a/Editor/Assets/Icons/loading-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/loading-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/loading-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/loading-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/loading-light.png b/Editor/Collaborate/Assets/Icons/loading-light.png
similarity index 100%
rename from Editor/Assets/Icons/loading-light.png
rename to Editor/Collaborate/Assets/Icons/loading-light.png
diff --git a/Editor/Assets/Icons/loading-light.png.meta b/Editor/Collaborate/Assets/Icons/loading-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/loading-light.png.meta
rename to Editor/Collaborate/Assets/Icons/loading-light.png.meta
diff --git a/Editor/Assets/Icons/loading-light@2x.png b/Editor/Collaborate/Assets/Icons/loading-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/loading-light@2x.png
rename to Editor/Collaborate/Assets/Icons/loading-light@2x.png
diff --git a/Editor/Assets/Icons/loading-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/loading-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/loading-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/loading-light@2x.png.meta
diff --git a/Editor/Assets/Icons/merge-conflicts-dark.png b/Editor/Collaborate/Assets/Icons/merge-conflicts-dark.png
similarity index 100%
rename from Editor/Assets/Icons/merge-conflicts-dark.png
rename to Editor/Collaborate/Assets/Icons/merge-conflicts-dark.png
diff --git a/Editor/Assets/Icons/merge-conflicts-dark.png.meta b/Editor/Collaborate/Assets/Icons/merge-conflicts-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/merge-conflicts-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/merge-conflicts-dark.png.meta
diff --git a/Editor/Assets/Icons/merge-conflicts-dark@2x.png b/Editor/Collaborate/Assets/Icons/merge-conflicts-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/merge-conflicts-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/merge-conflicts-dark@2x.png
diff --git a/Editor/Assets/Icons/merge-conflicts-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/merge-conflicts-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/merge-conflicts-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/merge-conflicts-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/merge-conflicts-light.png b/Editor/Collaborate/Assets/Icons/merge-conflicts-light.png
similarity index 100%
rename from Editor/Assets/Icons/merge-conflicts-light.png
rename to Editor/Collaborate/Assets/Icons/merge-conflicts-light.png
diff --git a/Editor/Assets/Icons/merge-conflicts-light.png.meta b/Editor/Collaborate/Assets/Icons/merge-conflicts-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/merge-conflicts-light.png.meta
rename to Editor/Collaborate/Assets/Icons/merge-conflicts-light.png.meta
diff --git a/Editor/Assets/Icons/merge-conflicts-light@2x.png b/Editor/Collaborate/Assets/Icons/merge-conflicts-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/merge-conflicts-light@2x.png
rename to Editor/Collaborate/Assets/Icons/merge-conflicts-light@2x.png
diff --git a/Editor/Assets/Icons/merge-conflicts-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/merge-conflicts-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/merge-conflicts-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/merge-conflicts-light@2x.png.meta
diff --git a/Editor/Assets/Icons/merge-dark.png b/Editor/Collaborate/Assets/Icons/merge-dark.png
similarity index 100%
rename from Editor/Assets/Icons/merge-dark.png
rename to Editor/Collaborate/Assets/Icons/merge-dark.png
diff --git a/Editor/Assets/Icons/merge-dark.png.meta b/Editor/Collaborate/Assets/Icons/merge-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/merge-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/merge-dark.png.meta
diff --git a/Editor/Assets/Icons/merge-dark@2x.png b/Editor/Collaborate/Assets/Icons/merge-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/merge-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/merge-dark@2x.png
diff --git a/Editor/Assets/Icons/merge-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/merge-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/merge-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/merge-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/merge-light.png b/Editor/Collaborate/Assets/Icons/merge-light.png
similarity index 100%
rename from Editor/Assets/Icons/merge-light.png
rename to Editor/Collaborate/Assets/Icons/merge-light.png
diff --git a/Editor/Assets/Icons/merge-light.png.meta b/Editor/Collaborate/Assets/Icons/merge-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/merge-light.png.meta
rename to Editor/Collaborate/Assets/Icons/merge-light.png.meta
diff --git a/Editor/Assets/Icons/merge-light@2x.png b/Editor/Collaborate/Assets/Icons/merge-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/merge-light@2x.png
rename to Editor/Collaborate/Assets/Icons/merge-light@2x.png
diff --git a/Editor/Assets/Icons/merge-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/merge-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/merge-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/merge-light@2x.png.meta
diff --git a/Editor/Assets/Icons/more-vert-dark.png b/Editor/Collaborate/Assets/Icons/more-vert-dark.png
similarity index 100%
rename from Editor/Assets/Icons/more-vert-dark.png
rename to Editor/Collaborate/Assets/Icons/more-vert-dark.png
diff --git a/Editor/Assets/Icons/more-vert-dark.png.meta b/Editor/Collaborate/Assets/Icons/more-vert-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/more-vert-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/more-vert-dark.png.meta
diff --git a/Editor/Assets/Icons/more-vert-dark@2x.png b/Editor/Collaborate/Assets/Icons/more-vert-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/more-vert-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/more-vert-dark@2x.png
diff --git a/Editor/Assets/Icons/more-vert-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/more-vert-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/more-vert-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/more-vert-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/more-vert-light.png b/Editor/Collaborate/Assets/Icons/more-vert-light.png
similarity index 100%
rename from Editor/Assets/Icons/more-vert-light.png
rename to Editor/Collaborate/Assets/Icons/more-vert-light.png
diff --git a/Editor/Assets/Icons/more-vert-light.png.meta b/Editor/Collaborate/Assets/Icons/more-vert-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/more-vert-light.png.meta
rename to Editor/Collaborate/Assets/Icons/more-vert-light.png.meta
diff --git a/Editor/Assets/Icons/more-vert-light@2x.png b/Editor/Collaborate/Assets/Icons/more-vert-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/more-vert-light@2x.png
rename to Editor/Collaborate/Assets/Icons/more-vert-light@2x.png
diff --git a/Editor/Assets/Icons/more-vert-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/more-vert-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/more-vert-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/more-vert-light@2x.png.meta
diff --git a/Editor/Assets/Icons/moved-file-dark.png b/Editor/Collaborate/Assets/Icons/moved-file-dark.png
similarity index 100%
rename from Editor/Assets/Icons/moved-file-dark.png
rename to Editor/Collaborate/Assets/Icons/moved-file-dark.png
diff --git a/Editor/Assets/Icons/moved-file-dark.png.meta b/Editor/Collaborate/Assets/Icons/moved-file-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/moved-file-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/moved-file-dark.png.meta
diff --git a/Editor/Assets/Icons/moved-file-dark@2x.png b/Editor/Collaborate/Assets/Icons/moved-file-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/moved-file-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/moved-file-dark@2x.png
diff --git a/Editor/Assets/Icons/moved-file-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/moved-file-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/moved-file-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/moved-file-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/moved-file-light.png b/Editor/Collaborate/Assets/Icons/moved-file-light.png
similarity index 100%
rename from Editor/Assets/Icons/moved-file-light.png
rename to Editor/Collaborate/Assets/Icons/moved-file-light.png
diff --git a/Editor/Assets/Icons/moved-file-light.png.meta b/Editor/Collaborate/Assets/Icons/moved-file-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/moved-file-light.png.meta
rename to Editor/Collaborate/Assets/Icons/moved-file-light.png.meta
diff --git a/Editor/Assets/Icons/moved-file-light@2x.png b/Editor/Collaborate/Assets/Icons/moved-file-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/moved-file-light@2x.png
rename to Editor/Collaborate/Assets/Icons/moved-file-light@2x.png
diff --git a/Editor/Assets/Icons/moved-file-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/moved-file-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/moved-file-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/moved-file-light@2x.png.meta
diff --git a/Editor/Assets/Icons/publish-dark.png b/Editor/Collaborate/Assets/Icons/publish-dark.png
similarity index 100%
rename from Editor/Assets/Icons/publish-dark.png
rename to Editor/Collaborate/Assets/Icons/publish-dark.png
diff --git a/Editor/Assets/Icons/publish-dark.png.meta b/Editor/Collaborate/Assets/Icons/publish-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/publish-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/publish-dark.png.meta
diff --git a/Editor/Assets/Icons/publish-dark@2x.png b/Editor/Collaborate/Assets/Icons/publish-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/publish-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/publish-dark@2x.png
diff --git a/Editor/Assets/Icons/publish-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/publish-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/publish-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/publish-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/publish-light.png b/Editor/Collaborate/Assets/Icons/publish-light.png
similarity index 100%
rename from Editor/Assets/Icons/publish-light.png
rename to Editor/Collaborate/Assets/Icons/publish-light.png
diff --git a/Editor/Assets/Icons/publish-light.png.meta b/Editor/Collaborate/Assets/Icons/publish-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/publish-light.png.meta
rename to Editor/Collaborate/Assets/Icons/publish-light.png.meta
diff --git a/Editor/Assets/Icons/publish-light@2x.png b/Editor/Collaborate/Assets/Icons/publish-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/publish-light@2x.png
rename to Editor/Collaborate/Assets/Icons/publish-light@2x.png
diff --git a/Editor/Assets/Icons/publish-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/publish-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/publish-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/publish-light@2x.png.meta
diff --git a/Editor/Assets/Icons/revert-asset-dark.png b/Editor/Collaborate/Assets/Icons/revert-asset-dark.png
similarity index 100%
rename from Editor/Assets/Icons/revert-asset-dark.png
rename to Editor/Collaborate/Assets/Icons/revert-asset-dark.png
diff --git a/Editor/Assets/Icons/revert-asset-dark.png.meta b/Editor/Collaborate/Assets/Icons/revert-asset-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/revert-asset-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/revert-asset-dark.png.meta
diff --git a/Editor/Assets/Icons/revert-asset-dark@2x.png b/Editor/Collaborate/Assets/Icons/revert-asset-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/revert-asset-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/revert-asset-dark@2x.png
diff --git a/Editor/Assets/Icons/revert-asset-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/revert-asset-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/revert-asset-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/revert-asset-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/revert-asset-light.png b/Editor/Collaborate/Assets/Icons/revert-asset-light.png
similarity index 100%
rename from Editor/Assets/Icons/revert-asset-light.png
rename to Editor/Collaborate/Assets/Icons/revert-asset-light.png
diff --git a/Editor/Assets/Icons/revert-asset-light.png.meta b/Editor/Collaborate/Assets/Icons/revert-asset-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/revert-asset-light.png.meta
rename to Editor/Collaborate/Assets/Icons/revert-asset-light.png.meta
diff --git a/Editor/Assets/Icons/revert-asset-light@2x.png b/Editor/Collaborate/Assets/Icons/revert-asset-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/revert-asset-light@2x.png
rename to Editor/Collaborate/Assets/Icons/revert-asset-light@2x.png
diff --git a/Editor/Assets/Icons/revert-asset-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/revert-asset-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/revert-asset-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/revert-asset-light@2x.png.meta
diff --git a/Editor/Assets/Icons/search-dark.png b/Editor/Collaborate/Assets/Icons/search-dark.png
similarity index 100%
rename from Editor/Assets/Icons/search-dark.png
rename to Editor/Collaborate/Assets/Icons/search-dark.png
diff --git a/Editor/Assets/Icons/search-dark.png.meta b/Editor/Collaborate/Assets/Icons/search-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/search-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/search-dark.png.meta
diff --git a/Editor/Assets/Icons/search-dark@2x.png b/Editor/Collaborate/Assets/Icons/search-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/search-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/search-dark@2x.png
diff --git a/Editor/Assets/Icons/search-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/search-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/search-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/search-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/search-light.png b/Editor/Collaborate/Assets/Icons/search-light.png
similarity index 100%
rename from Editor/Assets/Icons/search-light.png
rename to Editor/Collaborate/Assets/Icons/search-light.png
diff --git a/Editor/Assets/Icons/search-light.png.meta b/Editor/Collaborate/Assets/Icons/search-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/search-light.png.meta
rename to Editor/Collaborate/Assets/Icons/search-light.png.meta
diff --git a/Editor/Assets/Icons/search-light@2x.png b/Editor/Collaborate/Assets/Icons/search-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/search-light@2x.png
rename to Editor/Collaborate/Assets/Icons/search-light@2x.png
diff --git a/Editor/Assets/Icons/search-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/search-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/search-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/search-light@2x.png.meta
diff --git a/Editor/Assets/Icons/show-dark.png b/Editor/Collaborate/Assets/Icons/show-dark.png
similarity index 100%
rename from Editor/Assets/Icons/show-dark.png
rename to Editor/Collaborate/Assets/Icons/show-dark.png
diff --git a/Editor/Assets/Icons/show-dark.png.meta b/Editor/Collaborate/Assets/Icons/show-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/show-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/show-dark.png.meta
diff --git a/Editor/Assets/Icons/show-dark@2x.png b/Editor/Collaborate/Assets/Icons/show-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/show-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/show-dark@2x.png
diff --git a/Editor/Assets/Icons/show-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/show-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/show-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/show-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/show-light.png b/Editor/Collaborate/Assets/Icons/show-light.png
similarity index 100%
rename from Editor/Assets/Icons/show-light.png
rename to Editor/Collaborate/Assets/Icons/show-light.png
diff --git a/Editor/Assets/Icons/show-light.png.meta b/Editor/Collaborate/Assets/Icons/show-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/show-light.png.meta
rename to Editor/Collaborate/Assets/Icons/show-light.png.meta
diff --git a/Editor/Assets/Icons/show-light@2x.png b/Editor/Collaborate/Assets/Icons/show-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/show-light@2x.png
rename to Editor/Collaborate/Assets/Icons/show-light@2x.png
diff --git a/Editor/Assets/Icons/show-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/show-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/show-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/show-light@2x.png.meta
diff --git a/Editor/Assets/Icons/status-error-dark.png b/Editor/Collaborate/Assets/Icons/status-error-dark.png
similarity index 100%
rename from Editor/Assets/Icons/status-error-dark.png
rename to Editor/Collaborate/Assets/Icons/status-error-dark.png
diff --git a/Editor/Assets/Icons/status-error-dark.png.meta b/Editor/Collaborate/Assets/Icons/status-error-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-error-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/status-error-dark.png.meta
diff --git a/Editor/Assets/Icons/status-error-dark@2x.png b/Editor/Collaborate/Assets/Icons/status-error-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/status-error-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/status-error-dark@2x.png
diff --git a/Editor/Assets/Icons/status-error-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/status-error-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-error-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/status-error-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/status-error-light.png b/Editor/Collaborate/Assets/Icons/status-error-light.png
similarity index 100%
rename from Editor/Assets/Icons/status-error-light.png
rename to Editor/Collaborate/Assets/Icons/status-error-light.png
diff --git a/Editor/Assets/Icons/status-error-light.png.meta b/Editor/Collaborate/Assets/Icons/status-error-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-error-light.png.meta
rename to Editor/Collaborate/Assets/Icons/status-error-light.png.meta
diff --git a/Editor/Assets/Icons/status-error-light@2x.png b/Editor/Collaborate/Assets/Icons/status-error-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/status-error-light@2x.png
rename to Editor/Collaborate/Assets/Icons/status-error-light@2x.png
diff --git a/Editor/Assets/Icons/status-error-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/status-error-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-error-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/status-error-light@2x.png.meta
diff --git a/Editor/Assets/Icons/status-info-dark.png b/Editor/Collaborate/Assets/Icons/status-info-dark.png
similarity index 100%
rename from Editor/Assets/Icons/status-info-dark.png
rename to Editor/Collaborate/Assets/Icons/status-info-dark.png
diff --git a/Editor/Assets/Icons/status-info-dark.png.meta b/Editor/Collaborate/Assets/Icons/status-info-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-info-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/status-info-dark.png.meta
diff --git a/Editor/Assets/Icons/status-info-dark@2x.png b/Editor/Collaborate/Assets/Icons/status-info-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/status-info-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/status-info-dark@2x.png
diff --git a/Editor/Assets/Icons/status-info-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/status-info-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-info-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/status-info-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/status-info-light.png b/Editor/Collaborate/Assets/Icons/status-info-light.png
similarity index 100%
rename from Editor/Assets/Icons/status-info-light.png
rename to Editor/Collaborate/Assets/Icons/status-info-light.png
diff --git a/Editor/Assets/Icons/status-info-light.png.meta b/Editor/Collaborate/Assets/Icons/status-info-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-info-light.png.meta
rename to Editor/Collaborate/Assets/Icons/status-info-light.png.meta
diff --git a/Editor/Assets/Icons/status-info-light@2x.png b/Editor/Collaborate/Assets/Icons/status-info-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/status-info-light@2x.png
rename to Editor/Collaborate/Assets/Icons/status-info-light@2x.png
diff --git a/Editor/Assets/Icons/status-info-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/status-info-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-info-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/status-info-light@2x.png.meta
diff --git a/Editor/Assets/Icons/status-warning-dark.png b/Editor/Collaborate/Assets/Icons/status-warning-dark.png
similarity index 100%
rename from Editor/Assets/Icons/status-warning-dark.png
rename to Editor/Collaborate/Assets/Icons/status-warning-dark.png
diff --git a/Editor/Assets/Icons/status-warning-dark.png.meta b/Editor/Collaborate/Assets/Icons/status-warning-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-warning-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/status-warning-dark.png.meta
diff --git a/Editor/Assets/Icons/status-warning-dark@2x.png b/Editor/Collaborate/Assets/Icons/status-warning-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/status-warning-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/status-warning-dark@2x.png
diff --git a/Editor/Assets/Icons/status-warning-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/status-warning-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-warning-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/status-warning-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/status-warning-light.png b/Editor/Collaborate/Assets/Icons/status-warning-light.png
similarity index 100%
rename from Editor/Assets/Icons/status-warning-light.png
rename to Editor/Collaborate/Assets/Icons/status-warning-light.png
diff --git a/Editor/Assets/Icons/status-warning-light.png.meta b/Editor/Collaborate/Assets/Icons/status-warning-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-warning-light.png.meta
rename to Editor/Collaborate/Assets/Icons/status-warning-light.png.meta
diff --git a/Editor/Assets/Icons/status-warning-light@2x.png b/Editor/Collaborate/Assets/Icons/status-warning-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/status-warning-light@2x.png
rename to Editor/Collaborate/Assets/Icons/status-warning-light@2x.png
diff --git a/Editor/Assets/Icons/status-warning-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/status-warning-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/status-warning-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/status-warning-light@2x.png.meta
diff --git a/Editor/Assets/Icons/undo-dark.png b/Editor/Collaborate/Assets/Icons/undo-dark.png
similarity index 100%
rename from Editor/Assets/Icons/undo-dark.png
rename to Editor/Collaborate/Assets/Icons/undo-dark.png
diff --git a/Editor/Assets/Icons/undo-dark.png.meta b/Editor/Collaborate/Assets/Icons/undo-dark.png.meta
similarity index 100%
rename from Editor/Assets/Icons/undo-dark.png.meta
rename to Editor/Collaborate/Assets/Icons/undo-dark.png.meta
diff --git a/Editor/Assets/Icons/undo-dark@2x.png b/Editor/Collaborate/Assets/Icons/undo-dark@2x.png
similarity index 100%
rename from Editor/Assets/Icons/undo-dark@2x.png
rename to Editor/Collaborate/Assets/Icons/undo-dark@2x.png
diff --git a/Editor/Assets/Icons/undo-dark@2x.png.meta b/Editor/Collaborate/Assets/Icons/undo-dark@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/undo-dark@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/undo-dark@2x.png.meta
diff --git a/Editor/Assets/Icons/undo-light.png b/Editor/Collaborate/Assets/Icons/undo-light.png
similarity index 100%
rename from Editor/Assets/Icons/undo-light.png
rename to Editor/Collaborate/Assets/Icons/undo-light.png
diff --git a/Editor/Assets/Icons/undo-light.png.meta b/Editor/Collaborate/Assets/Icons/undo-light.png.meta
similarity index 100%
rename from Editor/Assets/Icons/undo-light.png.meta
rename to Editor/Collaborate/Assets/Icons/undo-light.png.meta
diff --git a/Editor/Assets/Icons/undo-light@2x.png b/Editor/Collaborate/Assets/Icons/undo-light@2x.png
similarity index 100%
rename from Editor/Assets/Icons/undo-light@2x.png
rename to Editor/Collaborate/Assets/Icons/undo-light@2x.png
diff --git a/Editor/Assets/Icons/undo-light@2x.png.meta b/Editor/Collaborate/Assets/Icons/undo-light@2x.png.meta
similarity index 100%
rename from Editor/Assets/Icons/undo-light@2x.png.meta
rename to Editor/Collaborate/Assets/Icons/undo-light@2x.png.meta
diff --git a/Editor/Assets/Layouts.meta b/Editor/Collaborate/Assets/Layouts.meta
similarity index 100%
rename from Editor/Assets/Layouts.meta
rename to Editor/Collaborate/Assets/Layouts.meta
diff --git a/Editor/Assets/Layouts/AlertBox.uxml b/Editor/Collaborate/Assets/Layouts/AlertBox.uxml
similarity index 100%
rename from Editor/Assets/Layouts/AlertBox.uxml
rename to Editor/Collaborate/Assets/Layouts/AlertBox.uxml
diff --git a/Editor/Assets/Layouts/AlertBox.uxml.meta b/Editor/Collaborate/Assets/Layouts/AlertBox.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/AlertBox.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/AlertBox.uxml.meta
diff --git a/Editor/Assets/Layouts/BaseChangeListElement.uxml b/Editor/Collaborate/Assets/Layouts/BaseChangeListElement.uxml
similarity index 100%
rename from Editor/Assets/Layouts/BaseChangeListElement.uxml
rename to Editor/Collaborate/Assets/Layouts/BaseChangeListElement.uxml
diff --git a/Editor/Assets/Layouts/BaseChangeListElement.uxml.meta b/Editor/Collaborate/Assets/Layouts/BaseChangeListElement.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/BaseChangeListElement.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/BaseChangeListElement.uxml.meta
diff --git a/Editor/Assets/Layouts/ChangesGroupHeader.uxml b/Editor/Collaborate/Assets/Layouts/ChangesGroupHeader.uxml
similarity index 100%
rename from Editor/Assets/Layouts/ChangesGroupHeader.uxml
rename to Editor/Collaborate/Assets/Layouts/ChangesGroupHeader.uxml
diff --git a/Editor/Assets/Layouts/ChangesGroupHeader.uxml.meta b/Editor/Collaborate/Assets/Layouts/ChangesGroupHeader.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/ChangesGroupHeader.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/ChangesGroupHeader.uxml.meta
diff --git a/Editor/Assets/Layouts/ChangesTabPageView.uxml b/Editor/Collaborate/Assets/Layouts/ChangesTabPageView.uxml
similarity index 100%
rename from Editor/Assets/Layouts/ChangesTabPageView.uxml
rename to Editor/Collaborate/Assets/Layouts/ChangesTabPageView.uxml
diff --git a/Editor/Assets/Layouts/ChangesTabPageView.uxml.meta b/Editor/Collaborate/Assets/Layouts/ChangesTabPageView.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/ChangesTabPageView.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/ChangesTabPageView.uxml.meta
diff --git a/Editor/Assets/Layouts/ErrorPageView.uxml b/Editor/Collaborate/Assets/Layouts/ErrorPageView.uxml
similarity index 100%
rename from Editor/Assets/Layouts/ErrorPageView.uxml
rename to Editor/Collaborate/Assets/Layouts/ErrorPageView.uxml
diff --git a/Editor/Assets/Layouts/ErrorPageView.uxml.meta b/Editor/Collaborate/Assets/Layouts/ErrorPageView.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/ErrorPageView.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/ErrorPageView.uxml.meta
diff --git a/Editor/Assets/Layouts/HistoryEntryComponent.uxml b/Editor/Collaborate/Assets/Layouts/HistoryEntryComponent.uxml
similarity index 100%
rename from Editor/Assets/Layouts/HistoryEntryComponent.uxml
rename to Editor/Collaborate/Assets/Layouts/HistoryEntryComponent.uxml
diff --git a/Editor/Assets/Layouts/HistoryEntryComponent.uxml.meta b/Editor/Collaborate/Assets/Layouts/HistoryEntryComponent.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/HistoryEntryComponent.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/HistoryEntryComponent.uxml.meta
diff --git a/Editor/Assets/Layouts/HistoryTabPageView.uxml b/Editor/Collaborate/Assets/Layouts/HistoryTabPageView.uxml
similarity index 100%
rename from Editor/Assets/Layouts/HistoryTabPageView.uxml
rename to Editor/Collaborate/Assets/Layouts/HistoryTabPageView.uxml
diff --git a/Editor/Assets/Layouts/HistoryTabPageView.uxml.meta b/Editor/Collaborate/Assets/Layouts/HistoryTabPageView.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/HistoryTabPageView.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/HistoryTabPageView.uxml.meta
diff --git a/Editor/Assets/Layouts/ListNotice.uxml b/Editor/Collaborate/Assets/Layouts/ListNotice.uxml
similarity index 100%
rename from Editor/Assets/Layouts/ListNotice.uxml
rename to Editor/Collaborate/Assets/Layouts/ListNotice.uxml
diff --git a/Editor/Assets/Layouts/ListNotice.uxml.meta b/Editor/Collaborate/Assets/Layouts/ListNotice.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/ListNotice.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/ListNotice.uxml.meta
diff --git a/Editor/Assets/Layouts/MainPageView.uxml b/Editor/Collaborate/Assets/Layouts/MainPageView.uxml
similarity index 100%
rename from Editor/Assets/Layouts/MainPageView.uxml
rename to Editor/Collaborate/Assets/Layouts/MainPageView.uxml
diff --git a/Editor/Assets/Layouts/MainPageView.uxml.meta b/Editor/Collaborate/Assets/Layouts/MainPageView.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/MainPageView.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/MainPageView.uxml.meta
diff --git a/Editor/Assets/Layouts/Paginator.uxml b/Editor/Collaborate/Assets/Layouts/Paginator.uxml
similarity index 100%
rename from Editor/Assets/Layouts/Paginator.uxml
rename to Editor/Collaborate/Assets/Layouts/Paginator.uxml
diff --git a/Editor/Assets/Layouts/Paginator.uxml.meta b/Editor/Collaborate/Assets/Layouts/Paginator.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/Paginator.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/Paginator.uxml.meta
diff --git a/Editor/Assets/Layouts/ProgressView.uxml b/Editor/Collaborate/Assets/Layouts/ProgressView.uxml
similarity index 100%
rename from Editor/Assets/Layouts/ProgressView.uxml
rename to Editor/Collaborate/Assets/Layouts/ProgressView.uxml
diff --git a/Editor/Assets/Layouts/ProgressView.uxml.meta b/Editor/Collaborate/Assets/Layouts/ProgressView.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/ProgressView.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/ProgressView.uxml.meta
diff --git a/Editor/Assets/Layouts/StartPageView.uxml b/Editor/Collaborate/Assets/Layouts/StartPageView.uxml
similarity index 100%
rename from Editor/Assets/Layouts/StartPageView.uxml
rename to Editor/Collaborate/Assets/Layouts/StartPageView.uxml
diff --git a/Editor/Assets/Layouts/StartPageView.uxml.meta b/Editor/Collaborate/Assets/Layouts/StartPageView.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/StartPageView.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/StartPageView.uxml.meta
diff --git a/Editor/Assets/Layouts/TopBar.uxml b/Editor/Collaborate/Assets/Layouts/TopBar.uxml
similarity index 100%
rename from Editor/Assets/Layouts/TopBar.uxml
rename to Editor/Collaborate/Assets/Layouts/TopBar.uxml
diff --git a/Editor/Assets/Layouts/TopBar.uxml.meta b/Editor/Collaborate/Assets/Layouts/TopBar.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/TopBar.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/TopBar.uxml.meta
diff --git a/Editor/Assets/Layouts/main-window.uxml b/Editor/Collaborate/Assets/Layouts/main-window.uxml
similarity index 100%
rename from Editor/Assets/Layouts/main-window.uxml
rename to Editor/Collaborate/Assets/Layouts/main-window.uxml
diff --git a/Editor/Assets/Layouts/main-window.uxml.meta b/Editor/Collaborate/Assets/Layouts/main-window.uxml.meta
similarity index 100%
rename from Editor/Assets/Layouts/main-window.uxml.meta
rename to Editor/Collaborate/Assets/Layouts/main-window.uxml.meta
diff --git a/Editor/Assets/README.md b/Editor/Collaborate/Assets/README.md
similarity index 100%
rename from Editor/Assets/README.md
rename to Editor/Collaborate/Assets/README.md
diff --git a/Editor/Assets/README.md.meta b/Editor/Collaborate/Assets/README.md.meta
similarity index 100%
rename from Editor/Assets/README.md.meta
rename to Editor/Collaborate/Assets/README.md.meta
diff --git a/Editor/Assets/StringAssets.cs b/Editor/Collaborate/Assets/StringAssets.cs
similarity index 100%
rename from Editor/Assets/StringAssets.cs
rename to Editor/Collaborate/Assets/StringAssets.cs
diff --git a/Editor/Assets/StringAssets.cs.meta b/Editor/Collaborate/Assets/StringAssets.cs.meta
similarity index 100%
rename from Editor/Assets/StringAssets.cs.meta
rename to Editor/Collaborate/Assets/StringAssets.cs.meta
diff --git a/Editor/Assets/Styles.meta b/Editor/Collaborate/Assets/Styles.meta
similarity index 100%
rename from Editor/Assets/Styles.meta
rename to Editor/Collaborate/Assets/Styles.meta
diff --git a/Editor/Assets/Styles/AlertBox.uss b/Editor/Collaborate/Assets/Styles/AlertBox.uss
similarity index 75%
rename from Editor/Assets/Styles/AlertBox.uss
rename to Editor/Collaborate/Assets/Styles/AlertBox.uss
index d28c00c..1b6eb01 100644
--- a/Editor/Assets/Styles/AlertBox.uss
+++ b/Editor/Collaborate/Assets/Styles/AlertBox.uss
@@ -28,25 +28,25 @@
 }
 
 .dark .alert-box__icon.icon-info {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-info-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-info-dark.png");
 }
 
 .light .alert-box__icon.icon-info {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-info-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-info-light.png");
 }
 
 .dark .alert-box__icon.icon-warning {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-warning-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-warning-dark.png");
 }
 
 .light .alert-box__icon.icon-warning {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-warning-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-warning-light.png");
 }
 
 .dark .alert-box__icon.icon-alert {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-error-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-error-dark.png");
 }
 
 .light .alert-box__icon.icon-alert {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-error-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-error-light.png");
 }
diff --git a/Editor/Assets/Styles/AlertBox.uss.meta b/Editor/Collaborate/Assets/Styles/AlertBox.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/AlertBox.uss.meta
rename to Editor/Collaborate/Assets/Styles/AlertBox.uss.meta
diff --git a/Editor/Assets/Styles/BaseChangeListElement.uss b/Editor/Collaborate/Assets/Styles/BaseChangeListElement.uss
similarity index 81%
rename from Editor/Assets/Styles/BaseChangeListElement.uss
rename to Editor/Collaborate/Assets/Styles/BaseChangeListElement.uss
index 21baea5..f54996a 100644
--- a/Editor/Assets/Styles/BaseChangeListElement.uss
+++ b/Editor/Collaborate/Assets/Styles/BaseChangeListElement.uss
@@ -60,41 +60,41 @@
 /* File status icons */
 
 .dark .base-change-list-element__icon.added {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/added-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/added-file-dark.png");
 }
 
 .light .base-change-list-element__icon.added {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/added-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/added-file-light.png");
 }
 
 .dark .base-change-list-element__icon.moved {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/moved-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/moved-file-dark.png");
 }
 
 .light .base-change-list-element__icon.moved {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/moved-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/moved-file-light.png");
 }
 
 .dark .base-change-list-element__icon.edited {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/edited-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/edited-file-dark.png");
 }
 
 .light .base-change-list-element__icon.edited {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/edited-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/edited-file-light.png");
 }
 
 .dark .base-change-list-element__icon.deleted {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/deleted-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/deleted-file-dark.png");
 }
 
 .light .base-change-list-element__icon.deleted {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/deleted-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/deleted-file-light.png");
 }
 
 .dark .base-change-list-element__icon.conflicted {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/conflicted-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/conflicted-file-dark.png");
 }
 
 .light .base-change-list-element__icon.conflicted {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/conflicted-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/conflicted-file-light.png");
 }
diff --git a/Editor/Assets/Styles/BaseChangeListElement.uss.meta b/Editor/Collaborate/Assets/Styles/BaseChangeListElement.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/BaseChangeListElement.uss.meta
rename to Editor/Collaborate/Assets/Styles/BaseChangeListElement.uss.meta
diff --git a/Editor/Assets/Styles/BetterTextField.uss b/Editor/Collaborate/Assets/Styles/BetterTextField.uss
similarity index 100%
rename from Editor/Assets/Styles/BetterTextField.uss
rename to Editor/Collaborate/Assets/Styles/BetterTextField.uss
diff --git a/Editor/Assets/Styles/BetterTextField.uss.meta b/Editor/Collaborate/Assets/Styles/BetterTextField.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/BetterTextField.uss.meta
rename to Editor/Collaborate/Assets/Styles/BetterTextField.uss.meta
diff --git a/Editor/Assets/Styles/ChangesGroupHeader.uss b/Editor/Collaborate/Assets/Styles/ChangesGroupHeader.uss
similarity index 100%
rename from Editor/Assets/Styles/ChangesGroupHeader.uss
rename to Editor/Collaborate/Assets/Styles/ChangesGroupHeader.uss
diff --git a/Editor/Assets/Styles/ChangesGroupHeader.uss.meta b/Editor/Collaborate/Assets/Styles/ChangesGroupHeader.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/ChangesGroupHeader.uss.meta
rename to Editor/Collaborate/Assets/Styles/ChangesGroupHeader.uss.meta
diff --git a/Editor/Assets/Styles/ChangesTabPageView.uss b/Editor/Collaborate/Assets/Styles/ChangesTabPageView.uss
similarity index 100%
rename from Editor/Assets/Styles/ChangesTabPageView.uss
rename to Editor/Collaborate/Assets/Styles/ChangesTabPageView.uss
diff --git a/Editor/Assets/Styles/ChangesTabPageView.uss.meta b/Editor/Collaborate/Assets/Styles/ChangesTabPageView.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/ChangesTabPageView.uss.meta
rename to Editor/Collaborate/Assets/Styles/ChangesTabPageView.uss.meta
diff --git a/Editor/Assets/Styles/FloatingDialogue.uss b/Editor/Collaborate/Assets/Styles/FloatingDialogue.uss
similarity index 100%
rename from Editor/Assets/Styles/FloatingDialogue.uss
rename to Editor/Collaborate/Assets/Styles/FloatingDialogue.uss
diff --git a/Editor/Assets/Styles/FloatingDialogue.uss.meta b/Editor/Collaborate/Assets/Styles/FloatingDialogue.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/FloatingDialogue.uss.meta
rename to Editor/Collaborate/Assets/Styles/FloatingDialogue.uss.meta
diff --git a/Editor/Assets/Styles/FloatingMenu.uss b/Editor/Collaborate/Assets/Styles/FloatingMenu.uss
similarity index 100%
rename from Editor/Assets/Styles/FloatingMenu.uss
rename to Editor/Collaborate/Assets/Styles/FloatingMenu.uss
diff --git a/Editor/Assets/Styles/FloatingMenu.uss.meta b/Editor/Collaborate/Assets/Styles/FloatingMenu.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/FloatingMenu.uss.meta
rename to Editor/Collaborate/Assets/Styles/FloatingMenu.uss.meta
diff --git a/Editor/Assets/Styles/FloatingMenuItem.uss b/Editor/Collaborate/Assets/Styles/FloatingMenuItem.uss
similarity index 100%
rename from Editor/Assets/Styles/FloatingMenuItem.uss
rename to Editor/Collaborate/Assets/Styles/FloatingMenuItem.uss
diff --git a/Editor/Assets/Styles/FloatingMenuItem.uss.meta b/Editor/Collaborate/Assets/Styles/FloatingMenuItem.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/FloatingMenuItem.uss.meta
rename to Editor/Collaborate/Assets/Styles/FloatingMenuItem.uss.meta
diff --git a/Editor/Assets/Styles/HistoryEntryComponent.uss b/Editor/Collaborate/Assets/Styles/HistoryEntryComponent.uss
similarity index 100%
rename from Editor/Assets/Styles/HistoryEntryComponent.uss
rename to Editor/Collaborate/Assets/Styles/HistoryEntryComponent.uss
diff --git a/Editor/Assets/Styles/HistoryEntryComponent.uss.meta b/Editor/Collaborate/Assets/Styles/HistoryEntryComponent.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/HistoryEntryComponent.uss.meta
rename to Editor/Collaborate/Assets/Styles/HistoryEntryComponent.uss.meta
diff --git a/Editor/Assets/Styles/IconButton.uss b/Editor/Collaborate/Assets/Styles/IconButton.uss
similarity index 73%
rename from Editor/Assets/Styles/IconButton.uss
rename to Editor/Collaborate/Assets/Styles/IconButton.uss
index f3b0e41..9a8e2f9 100644
--- a/Editor/Assets/Styles/IconButton.uss
+++ b/Editor/Collaborate/Assets/Styles/IconButton.uss
@@ -9,75 +9,75 @@
 }
 
 .dark .unity-icon-button.btn-overflow {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/more-vert-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/more-vert-dark.png");
 }
 
 .light .unity-icon-button.btn-overflow {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/more-vert-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/more-vert-light.png");
 }
 
 .dark .unity-icon-button.btn-undo {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/undo-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/undo-dark.png");
 }
 
 .light .unity-icon-button.btn-undo {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/undo-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/undo-light.png");
 }
 
 .dark .unity-icon-button.btn-revert {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/revert-asset-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/revert-asset-dark.png");
 }
 
 .light .unity-icon-button.btn-revert {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/revert-asset-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/revert-asset-light.png");
 }
 
 .dark .unity-icon-button.btn-back {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/back-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/back-dark.png");
 }
 
 .light .unity-icon-button.btn-back {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/back-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/back-light.png");
 }
 
 .dark .unity-icon-button.btn-show {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/show-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/show-dark.png");
 }
 
 .light .unity-icon-button.btn-show {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/show-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/show-light.png");
 }
 
 .dark .unity-icon-button.btn-merge {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/merge-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/merge-dark.png");
 }
 
 .light .unity-icon-button.btn-merge {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/merge-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/merge-light.png");
 }
 
 .dark .unity-icon-button.btn-choose-remote {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/choose-remote-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/choose-remote-dark.png");
 }
 
 .light .unity-icon-button.btn-choose-remote {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/choose-remote-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/choose-remote-light.png");
 }
 
 .dark .unity-icon-button.btn-choose-mine {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/choose-mine-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/choose-mine-dark.png");
 }
 
 .light .unity-icon-button.btn-choose-mine {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/choose-mine-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/choose-mine-light.png");
 }
 
 .dark .unity-icon-button.btn-diff {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/diff-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/diff-dark.png");
 }
 
 .light .unity-icon-button.btn-diff {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/diff-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/diff-light.png");
 }
 
 .dark .unity-icon-button:focus {
diff --git a/Editor/Assets/Styles/IconButton.uss.meta b/Editor/Collaborate/Assets/Styles/IconButton.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/IconButton.uss.meta
rename to Editor/Collaborate/Assets/Styles/IconButton.uss.meta
diff --git a/Editor/Assets/Styles/IconTextButton.uss b/Editor/Collaborate/Assets/Styles/IconTextButton.uss
similarity index 82%
rename from Editor/Assets/Styles/IconTextButton.uss
rename to Editor/Collaborate/Assets/Styles/IconTextButton.uss
index ffc1f9f..6c55bcc 100644
--- a/Editor/Assets/Styles/IconTextButton.uss
+++ b/Editor/Collaborate/Assets/Styles/IconTextButton.uss
@@ -11,9 +11,9 @@
 }
 
 .light .unity-icon-text-button.icon-publish .unity-icon-text-button__image {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/publish-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/publish-light.png");
 }
 
 .dark .unity-icon-text-button.icon-publish .unity-icon-text-button__image {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/publish-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/publish-dark.png");
 }
diff --git a/Editor/Assets/Styles/IconTextButton.uss.meta b/Editor/Collaborate/Assets/Styles/IconTextButton.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/IconTextButton.uss.meta
rename to Editor/Collaborate/Assets/Styles/IconTextButton.uss.meta
diff --git a/Editor/Assets/Styles/ListNotice.uss b/Editor/Collaborate/Assets/Styles/ListNotice.uss
similarity index 100%
rename from Editor/Assets/Styles/ListNotice.uss
rename to Editor/Collaborate/Assets/Styles/ListNotice.uss
diff --git a/Editor/Assets/Styles/ListNotice.uss.meta b/Editor/Collaborate/Assets/Styles/ListNotice.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/ListNotice.uss.meta
rename to Editor/Collaborate/Assets/Styles/ListNotice.uss.meta
diff --git a/Editor/Assets/Styles/MainPageView.uss b/Editor/Collaborate/Assets/Styles/MainPageView.uss
similarity index 100%
rename from Editor/Assets/Styles/MainPageView.uss
rename to Editor/Collaborate/Assets/Styles/MainPageView.uss
diff --git a/Editor/Assets/Styles/MainPageView.uss.meta b/Editor/Collaborate/Assets/Styles/MainPageView.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/MainPageView.uss.meta
rename to Editor/Collaborate/Assets/Styles/MainPageView.uss.meta
diff --git a/Editor/Assets/Styles/Paginator.uss b/Editor/Collaborate/Assets/Styles/Paginator.uss
similarity index 100%
rename from Editor/Assets/Styles/Paginator.uss
rename to Editor/Collaborate/Assets/Styles/Paginator.uss
diff --git a/Editor/Assets/Styles/Paginator.uss.meta b/Editor/Collaborate/Assets/Styles/Paginator.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/Paginator.uss.meta
rename to Editor/Collaborate/Assets/Styles/Paginator.uss.meta
diff --git a/Editor/Assets/Styles/ProgressView.uss b/Editor/Collaborate/Assets/Styles/ProgressView.uss
similarity index 100%
rename from Editor/Assets/Styles/ProgressView.uss
rename to Editor/Collaborate/Assets/Styles/ProgressView.uss
diff --git a/Editor/Assets/Styles/ProgressView.uss.meta b/Editor/Collaborate/Assets/Styles/ProgressView.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/ProgressView.uss.meta
rename to Editor/Collaborate/Assets/Styles/ProgressView.uss.meta
diff --git a/Editor/Assets/Styles/SearchBar.uss b/Editor/Collaborate/Assets/Styles/SearchBar.uss
similarity index 88%
rename from Editor/Assets/Styles/SearchBar.uss
rename to Editor/Collaborate/Assets/Styles/SearchBar.uss
index 3668c16..a3e95d5 100644
--- a/Editor/Assets/Styles/SearchBar.uss
+++ b/Editor/Collaborate/Assets/Styles/SearchBar.uss
@@ -26,11 +26,11 @@
 }
 
 .dark .unity-search-bar__search-field #unity-search {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/search-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/search-dark.png");
 }
 
 .light .unity-search-bar__search-field #unity-search {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/search-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/search-light.png");
 }
 
 .unity-search-bar__search-field #unity-cancel {
@@ -41,11 +41,11 @@
 }
 
 .dark .unity-search-bar__search-field #unity-cancel {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/clear-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/clear-dark.png");
 }
 
 .light .unity-search-bar__search-field #unity-cancel {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/clear-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/clear-light.png");
 }
 
 .unity-search-bar__search-field #unity-cancel.unity-search-field-base__cancel-button--off {
diff --git a/Editor/Assets/Styles/SearchBar.uss.meta b/Editor/Collaborate/Assets/Styles/SearchBar.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/SearchBar.uss.meta
rename to Editor/Collaborate/Assets/Styles/SearchBar.uss.meta
diff --git a/Editor/Assets/Styles/StartPageView.uss b/Editor/Collaborate/Assets/Styles/StartPageView.uss
similarity index 100%
rename from Editor/Assets/Styles/StartPageView.uss
rename to Editor/Collaborate/Assets/Styles/StartPageView.uss
diff --git a/Editor/Assets/Styles/StartPageView.uss.meta b/Editor/Collaborate/Assets/Styles/StartPageView.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/StartPageView.uss.meta
rename to Editor/Collaborate/Assets/Styles/StartPageView.uss.meta
diff --git a/Editor/Assets/Styles/TabView.uss b/Editor/Collaborate/Assets/Styles/TabView.uss
similarity index 100%
rename from Editor/Assets/Styles/TabView.uss
rename to Editor/Collaborate/Assets/Styles/TabView.uss
diff --git a/Editor/Assets/Styles/TabView.uss.meta b/Editor/Collaborate/Assets/Styles/TabView.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/TabView.uss.meta
rename to Editor/Collaborate/Assets/Styles/TabView.uss.meta
diff --git a/Editor/Assets/Styles/TextButton.uss b/Editor/Collaborate/Assets/Styles/TextButton.uss
similarity index 100%
rename from Editor/Assets/Styles/TextButton.uss
rename to Editor/Collaborate/Assets/Styles/TextButton.uss
diff --git a/Editor/Assets/Styles/TextButton.uss.meta b/Editor/Collaborate/Assets/Styles/TextButton.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/TextButton.uss.meta
rename to Editor/Collaborate/Assets/Styles/TextButton.uss.meta
diff --git a/Editor/Assets/Styles/ToggleableChangeListElement.uss b/Editor/Collaborate/Assets/Styles/ToggleableChangeListElement.uss
similarity index 100%
rename from Editor/Assets/Styles/ToggleableChangeListElement.uss
rename to Editor/Collaborate/Assets/Styles/ToggleableChangeListElement.uss
diff --git a/Editor/Assets/Styles/ToggleableChangeListElement.uss.meta b/Editor/Collaborate/Assets/Styles/ToggleableChangeListElement.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/ToggleableChangeListElement.uss.meta
rename to Editor/Collaborate/Assets/Styles/ToggleableChangeListElement.uss.meta
diff --git a/Editor/Assets/Styles/TopBar.uss b/Editor/Collaborate/Assets/Styles/TopBar.uss
similarity index 84%
rename from Editor/Assets/Styles/TopBar.uss
rename to Editor/Collaborate/Assets/Styles/TopBar.uss
index f0608a8..07b5f05 100644
--- a/Editor/Assets/Styles/TopBar.uss
+++ b/Editor/Collaborate/Assets/Styles/TopBar.uss
@@ -28,9 +28,9 @@
 }
 
 .dark .top-bar__icon {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/collaborate-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/collaborate-dark.png");
 }
 
 .light .top-bar__icon {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/collaborate-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/collaborate-light.png");
 }
diff --git a/Editor/Assets/Styles/TopBar.uss.meta b/Editor/Collaborate/Assets/Styles/TopBar.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/TopBar.uss.meta
rename to Editor/Collaborate/Assets/Styles/TopBar.uss.meta
diff --git a/Editor/Assets/Styles/styles.uss b/Editor/Collaborate/Assets/Styles/styles.uss
similarity index 100%
rename from Editor/Assets/Styles/styles.uss
rename to Editor/Collaborate/Assets/Styles/styles.uss
diff --git a/Editor/Assets/Styles/styles.uss.meta b/Editor/Collaborate/Assets/Styles/styles.uss.meta
similarity index 100%
rename from Editor/Assets/Styles/styles.uss.meta
rename to Editor/Collaborate/Assets/Styles/styles.uss.meta
diff --git a/Editor/Assets/UiConstants.cs b/Editor/Collaborate/Assets/UiConstants.cs
similarity index 100%
rename from Editor/Assets/UiConstants.cs
rename to Editor/Collaborate/Assets/UiConstants.cs
diff --git a/Editor/Assets/UiConstants.cs.meta b/Editor/Collaborate/Assets/UiConstants.cs.meta
similarity index 100%
rename from Editor/Assets/UiConstants.cs.meta
rename to Editor/Collaborate/Assets/UiConstants.cs.meta
diff --git a/Editor/Common.meta b/Editor/Collaborate/Common.meta
similarity index 100%
rename from Editor/Common.meta
rename to Editor/Collaborate/Common.meta
diff --git a/Editor/Common/ArrayContainer.cs b/Editor/Collaborate/Common/ArrayContainer.cs
similarity index 100%
rename from Editor/Common/ArrayContainer.cs
rename to Editor/Collaborate/Common/ArrayContainer.cs
diff --git a/Editor/Common/ArrayContainer.cs.meta b/Editor/Collaborate/Common/ArrayContainer.cs.meta
similarity index 100%
rename from Editor/Common/ArrayContainer.cs.meta
rename to Editor/Collaborate/Common/ArrayContainer.cs.meta
diff --git a/Editor/Common/LocationAttribute.cs b/Editor/Collaborate/Common/LocationAttribute.cs
similarity index 100%
rename from Editor/Common/LocationAttribute.cs
rename to Editor/Collaborate/Common/LocationAttribute.cs
diff --git a/Editor/Common/LocationAttribute.cs.meta b/Editor/Collaborate/Common/LocationAttribute.cs.meta
similarity index 100%
rename from Editor/Common/LocationAttribute.cs.meta
rename to Editor/Collaborate/Common/LocationAttribute.cs.meta
diff --git a/Editor/Common/README.md b/Editor/Collaborate/Common/README.md
similarity index 100%
rename from Editor/Common/README.md
rename to Editor/Collaborate/Common/README.md
diff --git a/Editor/Common/README.md.meta b/Editor/Collaborate/Common/README.md.meta
similarity index 100%
rename from Editor/Common/README.md.meta
rename to Editor/Collaborate/Common/README.md.meta
diff --git a/Editor/Common/ScriptableObjectSingleton.cs b/Editor/Collaborate/Common/ScriptableObjectSingleton.cs
similarity index 100%
rename from Editor/Common/ScriptableObjectSingleton.cs
rename to Editor/Collaborate/Common/ScriptableObjectSingleton.cs
diff --git a/Editor/Common/ScriptableObjectSingleton.cs.meta b/Editor/Collaborate/Common/ScriptableObjectSingleton.cs.meta
similarity index 100%
rename from Editor/Common/ScriptableObjectSingleton.cs.meta
rename to Editor/Collaborate/Common/ScriptableObjectSingleton.cs.meta
diff --git a/Editor/Common/SerializableDictionary.cs b/Editor/Collaborate/Common/SerializableDictionary.cs
similarity index 100%
rename from Editor/Common/SerializableDictionary.cs
rename to Editor/Collaborate/Common/SerializableDictionary.cs
diff --git a/Editor/Common/SerializableDictionary.cs.meta b/Editor/Collaborate/Common/SerializableDictionary.cs.meta
similarity index 100%
rename from Editor/Common/SerializableDictionary.cs.meta
rename to Editor/Collaborate/Common/SerializableDictionary.cs.meta
diff --git a/Editor/Common/StringArrayContainer.cs b/Editor/Collaborate/Common/StringArrayContainer.cs
similarity index 100%
rename from Editor/Common/StringArrayContainer.cs
rename to Editor/Collaborate/Common/StringArrayContainer.cs
diff --git a/Editor/Common/StringArrayContainer.cs.meta b/Editor/Collaborate/Common/StringArrayContainer.cs.meta
similarity index 100%
rename from Editor/Common/StringArrayContainer.cs.meta
rename to Editor/Collaborate/Common/StringArrayContainer.cs.meta
diff --git a/Editor/Components.meta b/Editor/Collaborate/Components.meta
similarity index 100%
rename from Editor/Components.meta
rename to Editor/Collaborate/Components.meta
diff --git a/Editor/Components/AdapterListView.cs b/Editor/Collaborate/Components/AdapterListView.cs
similarity index 100%
rename from Editor/Components/AdapterListView.cs
rename to Editor/Collaborate/Components/AdapterListView.cs
diff --git a/Editor/Components/AdapterListView.cs.meta b/Editor/Collaborate/Components/AdapterListView.cs.meta
similarity index 100%
rename from Editor/Components/AdapterListView.cs.meta
rename to Editor/Collaborate/Components/AdapterListView.cs.meta
diff --git a/Editor/Components/AlertBox.cs b/Editor/Collaborate/Components/AlertBox.cs
similarity index 100%
rename from Editor/Components/AlertBox.cs
rename to Editor/Collaborate/Components/AlertBox.cs
diff --git a/Editor/Components/AlertBox.cs.meta b/Editor/Collaborate/Components/AlertBox.cs.meta
similarity index 100%
rename from Editor/Components/AlertBox.cs.meta
rename to Editor/Collaborate/Components/AlertBox.cs.meta
diff --git a/Editor/Components/BetterTextField.cs b/Editor/Collaborate/Components/BetterTextField.cs
similarity index 100%
rename from Editor/Components/BetterTextField.cs
rename to Editor/Collaborate/Components/BetterTextField.cs
diff --git a/Editor/Components/BetterTextField.cs.meta b/Editor/Collaborate/Components/BetterTextField.cs.meta
similarity index 100%
rename from Editor/Components/BetterTextField.cs.meta
rename to Editor/Collaborate/Components/BetterTextField.cs.meta
diff --git a/Editor/Components/ChangeEntryGroup.cs b/Editor/Collaborate/Components/ChangeEntryGroup.cs
similarity index 100%
rename from Editor/Components/ChangeEntryGroup.cs
rename to Editor/Collaborate/Components/ChangeEntryGroup.cs
diff --git a/Editor/Components/ChangeEntryGroup.cs.meta b/Editor/Collaborate/Components/ChangeEntryGroup.cs.meta
similarity index 100%
rename from Editor/Components/ChangeEntryGroup.cs.meta
rename to Editor/Collaborate/Components/ChangeEntryGroup.cs.meta
diff --git a/Editor/Components/ChangeListElements.meta b/Editor/Collaborate/Components/ChangeListElements.meta
similarity index 100%
rename from Editor/Components/ChangeListElements.meta
rename to Editor/Collaborate/Components/ChangeListElements.meta
diff --git a/Editor/Components/ChangeListElements/BaseChangeListElement.cs b/Editor/Collaborate/Components/ChangeListElements/BaseChangeListElement.cs
similarity index 100%
rename from Editor/Components/ChangeListElements/BaseChangeListElement.cs
rename to Editor/Collaborate/Components/ChangeListElements/BaseChangeListElement.cs
diff --git a/Editor/Components/ChangeListElements/BaseChangeListElement.cs.meta b/Editor/Collaborate/Components/ChangeListElements/BaseChangeListElement.cs.meta
similarity index 100%
rename from Editor/Components/ChangeListElements/BaseChangeListElement.cs.meta
rename to Editor/Collaborate/Components/ChangeListElements/BaseChangeListElement.cs.meta
diff --git a/Editor/Components/ChangeListElements/ChangeListElement.cs b/Editor/Collaborate/Components/ChangeListElements/ChangeListElement.cs
similarity index 100%
rename from Editor/Components/ChangeListElements/ChangeListElement.cs
rename to Editor/Collaborate/Components/ChangeListElements/ChangeListElement.cs
diff --git a/Editor/Components/ChangeListElements/ChangeListElement.cs.meta b/Editor/Collaborate/Components/ChangeListElements/ChangeListElement.cs.meta
similarity index 100%
rename from Editor/Components/ChangeListElements/ChangeListElement.cs.meta
rename to Editor/Collaborate/Components/ChangeListElements/ChangeListElement.cs.meta
diff --git a/Editor/Components/ChangeListElements/ConflictedChangeListElement.cs b/Editor/Collaborate/Components/ChangeListElements/ConflictedChangeListElement.cs
similarity index 100%
rename from Editor/Components/ChangeListElements/ConflictedChangeListElement.cs
rename to Editor/Collaborate/Components/ChangeListElements/ConflictedChangeListElement.cs
diff --git a/Editor/Components/ChangeListElements/ConflictedChangeListElement.cs.meta b/Editor/Collaborate/Components/ChangeListElements/ConflictedChangeListElement.cs.meta
similarity index 100%
rename from Editor/Components/ChangeListElements/ConflictedChangeListElement.cs.meta
rename to Editor/Collaborate/Components/ChangeListElements/ConflictedChangeListElement.cs.meta
diff --git a/Editor/Components/ChangeListElements/HistoryChangeListElement.cs b/Editor/Collaborate/Components/ChangeListElements/HistoryChangeListElement.cs
similarity index 100%
rename from Editor/Components/ChangeListElements/HistoryChangeListElement.cs
rename to Editor/Collaborate/Components/ChangeListElements/HistoryChangeListElement.cs
diff --git a/Editor/Components/ChangeListElements/HistoryChangeListElement.cs.meta b/Editor/Collaborate/Components/ChangeListElements/HistoryChangeListElement.cs.meta
similarity index 100%
rename from Editor/Components/ChangeListElements/HistoryChangeListElement.cs.meta
rename to Editor/Collaborate/Components/ChangeListElements/HistoryChangeListElement.cs.meta
diff --git a/Editor/Components/ChangeListElements/ToggleableChangeListElement.cs b/Editor/Collaborate/Components/ChangeListElements/ToggleableChangeListElement.cs
similarity index 100%
rename from Editor/Components/ChangeListElements/ToggleableChangeListElement.cs
rename to Editor/Collaborate/Components/ChangeListElements/ToggleableChangeListElement.cs
diff --git a/Editor/Components/ChangeListElements/ToggleableChangeListElement.cs.meta b/Editor/Collaborate/Components/ChangeListElements/ToggleableChangeListElement.cs.meta
similarity index 100%
rename from Editor/Components/ChangeListElements/ToggleableChangeListElement.cs.meta
rename to Editor/Collaborate/Components/ChangeListElements/ToggleableChangeListElement.cs.meta
diff --git a/Editor/Components/ChangesGroupHeader.cs b/Editor/Collaborate/Components/ChangesGroupHeader.cs
similarity index 100%
rename from Editor/Components/ChangesGroupHeader.cs
rename to Editor/Collaborate/Components/ChangesGroupHeader.cs
diff --git a/Editor/Components/ChangesGroupHeader.cs.meta b/Editor/Collaborate/Components/ChangesGroupHeader.cs.meta
similarity index 100%
rename from Editor/Components/ChangesGroupHeader.cs.meta
rename to Editor/Collaborate/Components/ChangesGroupHeader.cs.meta
diff --git a/Editor/Components/ErrorPageView.cs b/Editor/Collaborate/Components/ErrorPageView.cs
similarity index 100%
rename from Editor/Components/ErrorPageView.cs
rename to Editor/Collaborate/Components/ErrorPageView.cs
diff --git a/Editor/Components/ErrorPageView.cs.meta b/Editor/Collaborate/Components/ErrorPageView.cs.meta
similarity index 100%
rename from Editor/Components/ErrorPageView.cs.meta
rename to Editor/Collaborate/Components/ErrorPageView.cs.meta
diff --git a/Editor/Components/HistoryEntryComponent.cs b/Editor/Collaborate/Components/HistoryEntryComponent.cs
similarity index 100%
rename from Editor/Components/HistoryEntryComponent.cs
rename to Editor/Collaborate/Components/HistoryEntryComponent.cs
diff --git a/Editor/Components/HistoryEntryComponent.cs.meta b/Editor/Collaborate/Components/HistoryEntryComponent.cs.meta
similarity index 100%
rename from Editor/Components/HistoryEntryComponent.cs.meta
rename to Editor/Collaborate/Components/HistoryEntryComponent.cs.meta
diff --git a/Editor/Components/IconButton.cs b/Editor/Collaborate/Components/IconButton.cs
similarity index 100%
rename from Editor/Components/IconButton.cs
rename to Editor/Collaborate/Components/IconButton.cs
diff --git a/Editor/Components/IconButton.cs.meta b/Editor/Collaborate/Components/IconButton.cs.meta
similarity index 100%
rename from Editor/Components/IconButton.cs.meta
rename to Editor/Collaborate/Components/IconButton.cs.meta
diff --git a/Editor/Components/IconTextButton.cs b/Editor/Collaborate/Components/IconTextButton.cs
similarity index 100%
rename from Editor/Components/IconTextButton.cs
rename to Editor/Collaborate/Components/IconTextButton.cs
diff --git a/Editor/Components/IconTextButton.cs.meta b/Editor/Collaborate/Components/IconTextButton.cs.meta
similarity index 100%
rename from Editor/Components/IconTextButton.cs.meta
rename to Editor/Collaborate/Components/IconTextButton.cs.meta
diff --git a/Editor/Components/ListNotice.cs b/Editor/Collaborate/Components/ListNotice.cs
similarity index 100%
rename from Editor/Components/ListNotice.cs
rename to Editor/Collaborate/Components/ListNotice.cs
diff --git a/Editor/Components/ListNotice.cs.meta b/Editor/Collaborate/Components/ListNotice.cs.meta
similarity index 100%
rename from Editor/Components/ListNotice.cs.meta
rename to Editor/Collaborate/Components/ListNotice.cs.meta
diff --git a/Editor/Components/Menus.meta b/Editor/Collaborate/Components/Menus.meta
similarity index 100%
rename from Editor/Components/Menus.meta
rename to Editor/Collaborate/Components/Menus.meta
diff --git a/Editor/Components/Menus/FloatingDialogue.cs b/Editor/Collaborate/Components/Menus/FloatingDialogue.cs
similarity index 100%
rename from Editor/Components/Menus/FloatingDialogue.cs
rename to Editor/Collaborate/Components/Menus/FloatingDialogue.cs
diff --git a/Editor/Components/Menus/FloatingDialogue.cs.meta b/Editor/Collaborate/Components/Menus/FloatingDialogue.cs.meta
similarity index 100%
rename from Editor/Components/Menus/FloatingDialogue.cs.meta
rename to Editor/Collaborate/Components/Menus/FloatingDialogue.cs.meta
diff --git a/Editor/Components/Menus/FloatingMenu.cs b/Editor/Collaborate/Components/Menus/FloatingMenu.cs
similarity index 100%
rename from Editor/Components/Menus/FloatingMenu.cs
rename to Editor/Collaborate/Components/Menus/FloatingMenu.cs
diff --git a/Editor/Components/Menus/FloatingMenu.cs.meta b/Editor/Collaborate/Components/Menus/FloatingMenu.cs.meta
similarity index 100%
rename from Editor/Components/Menus/FloatingMenu.cs.meta
rename to Editor/Collaborate/Components/Menus/FloatingMenu.cs.meta
diff --git a/Editor/Components/Menus/FloatingMenuItem.cs b/Editor/Collaborate/Components/Menus/FloatingMenuItem.cs
similarity index 100%
rename from Editor/Components/Menus/FloatingMenuItem.cs
rename to Editor/Collaborate/Components/Menus/FloatingMenuItem.cs
diff --git a/Editor/Components/Menus/FloatingMenuItem.cs.meta b/Editor/Collaborate/Components/Menus/FloatingMenuItem.cs.meta
similarity index 100%
rename from Editor/Components/Menus/FloatingMenuItem.cs.meta
rename to Editor/Collaborate/Components/Menus/FloatingMenuItem.cs.meta
diff --git a/Editor/Components/PageComponent.cs b/Editor/Collaborate/Components/PageComponent.cs
similarity index 100%
rename from Editor/Components/PageComponent.cs
rename to Editor/Collaborate/Components/PageComponent.cs
diff --git a/Editor/Components/PageComponent.cs.meta b/Editor/Collaborate/Components/PageComponent.cs.meta
similarity index 100%
rename from Editor/Components/PageComponent.cs.meta
rename to Editor/Collaborate/Components/PageComponent.cs.meta
diff --git a/Editor/Components/Paginator.cs b/Editor/Collaborate/Components/Paginator.cs
similarity index 100%
rename from Editor/Components/Paginator.cs
rename to Editor/Collaborate/Components/Paginator.cs
diff --git a/Editor/Components/Paginator.cs.meta b/Editor/Collaborate/Components/Paginator.cs.meta
similarity index 100%
rename from Editor/Components/Paginator.cs.meta
rename to Editor/Collaborate/Components/Paginator.cs.meta
diff --git a/Editor/Components/ProgressView.cs b/Editor/Collaborate/Components/ProgressView.cs
similarity index 100%
rename from Editor/Components/ProgressView.cs
rename to Editor/Collaborate/Components/ProgressView.cs
diff --git a/Editor/Components/ProgressView.cs.meta b/Editor/Collaborate/Components/ProgressView.cs.meta
similarity index 100%
rename from Editor/Components/ProgressView.cs.meta
rename to Editor/Collaborate/Components/ProgressView.cs.meta
diff --git a/Editor/Components/README.md b/Editor/Collaborate/Components/README.md
similarity index 100%
rename from Editor/Components/README.md
rename to Editor/Collaborate/Components/README.md
diff --git a/Editor/Components/README.md.meta b/Editor/Collaborate/Components/README.md.meta
similarity index 100%
rename from Editor/Components/README.md.meta
rename to Editor/Collaborate/Components/README.md.meta
diff --git a/Editor/Components/SearchBar.cs b/Editor/Collaborate/Components/SearchBar.cs
similarity index 100%
rename from Editor/Components/SearchBar.cs
rename to Editor/Collaborate/Components/SearchBar.cs
diff --git a/Editor/Components/SearchBar.cs.meta b/Editor/Collaborate/Components/SearchBar.cs.meta
similarity index 100%
rename from Editor/Components/SearchBar.cs.meta
rename to Editor/Collaborate/Components/SearchBar.cs.meta
diff --git a/Editor/Components/TabPageComponent.cs b/Editor/Collaborate/Components/TabPageComponent.cs
similarity index 100%
rename from Editor/Components/TabPageComponent.cs
rename to Editor/Collaborate/Components/TabPageComponent.cs
diff --git a/Editor/Components/TabPageComponent.cs.meta b/Editor/Collaborate/Components/TabPageComponent.cs.meta
similarity index 100%
rename from Editor/Components/TabPageComponent.cs.meta
rename to Editor/Collaborate/Components/TabPageComponent.cs.meta
diff --git a/Editor/Components/TabView.cs b/Editor/Collaborate/Components/TabView.cs
similarity index 100%
rename from Editor/Components/TabView.cs
rename to Editor/Collaborate/Components/TabView.cs
diff --git a/Editor/Components/TabView.cs.meta b/Editor/Collaborate/Components/TabView.cs.meta
similarity index 100%
rename from Editor/Components/TabView.cs.meta
rename to Editor/Collaborate/Components/TabView.cs.meta
diff --git a/Editor/Components/TextButton.cs b/Editor/Collaborate/Components/TextButton.cs
similarity index 100%
rename from Editor/Components/TextButton.cs
rename to Editor/Collaborate/Components/TextButton.cs
diff --git a/Editor/Components/TextButton.cs.meta b/Editor/Collaborate/Components/TextButton.cs.meta
similarity index 100%
rename from Editor/Components/TextButton.cs.meta
rename to Editor/Collaborate/Components/TextButton.cs.meta
diff --git a/Editor/Components/TopBar.cs b/Editor/Collaborate/Components/TopBar.cs
similarity index 100%
rename from Editor/Components/TopBar.cs
rename to Editor/Collaborate/Components/TopBar.cs
diff --git a/Editor/Components/TopBar.cs.meta b/Editor/Collaborate/Components/TopBar.cs.meta
similarity index 100%
rename from Editor/Components/TopBar.cs.meta
rename to Editor/Collaborate/Components/TopBar.cs.meta
diff --git a/Editor/Models.meta b/Editor/Collaborate/Models.meta
similarity index 100%
rename from Editor/Models.meta
rename to Editor/Collaborate/Models.meta
diff --git a/Editor/Models/Api.meta b/Editor/Collaborate/Models/Api.meta
similarity index 100%
rename from Editor/Models/Api.meta
rename to Editor/Collaborate/Models/Api.meta
diff --git a/Editor/Models/Api/ISourceControlProvider.cs b/Editor/Collaborate/Models/Api/ISourceControlProvider.cs
similarity index 100%
rename from Editor/Models/Api/ISourceControlProvider.cs
rename to Editor/Collaborate/Models/Api/ISourceControlProvider.cs
diff --git a/Editor/Models/Api/ISourceControlProvider.cs.meta b/Editor/Collaborate/Models/Api/ISourceControlProvider.cs.meta
similarity index 100%
rename from Editor/Models/Api/ISourceControlProvider.cs.meta
rename to Editor/Collaborate/Models/Api/ISourceControlProvider.cs.meta
diff --git a/Editor/Models/ChangesModel.cs b/Editor/Collaborate/Models/ChangesModel.cs
similarity index 100%
rename from Editor/Models/ChangesModel.cs
rename to Editor/Collaborate/Models/ChangesModel.cs
diff --git a/Editor/Models/ChangesModel.cs.meta b/Editor/Collaborate/Models/ChangesModel.cs.meta
similarity index 100%
rename from Editor/Models/ChangesModel.cs.meta
rename to Editor/Collaborate/Models/ChangesModel.cs.meta
diff --git a/Editor/Models/Enums.meta b/Editor/Collaborate/Models/Enums.meta
similarity index 100%
rename from Editor/Models/Enums.meta
rename to Editor/Collaborate/Models/Enums.meta
diff --git a/Editor/Models/Enums/ProjectStatus.cs b/Editor/Collaborate/Models/Enums/ProjectStatus.cs
similarity index 100%
rename from Editor/Models/Enums/ProjectStatus.cs
rename to Editor/Collaborate/Models/Enums/ProjectStatus.cs
diff --git a/Editor/Models/Enums/ProjectStatus.cs.meta b/Editor/Collaborate/Models/Enums/ProjectStatus.cs.meta
similarity index 100%
rename from Editor/Models/Enums/ProjectStatus.cs.meta
rename to Editor/Collaborate/Models/Enums/ProjectStatus.cs.meta
diff --git a/Editor/Models/HistoryModel.cs b/Editor/Collaborate/Models/HistoryModel.cs
similarity index 100%
rename from Editor/Models/HistoryModel.cs
rename to Editor/Collaborate/Models/HistoryModel.cs
diff --git a/Editor/Models/HistoryModel.cs.meta b/Editor/Collaborate/Models/HistoryModel.cs.meta
similarity index 100%
rename from Editor/Models/HistoryModel.cs.meta
rename to Editor/Collaborate/Models/HistoryModel.cs.meta
diff --git a/Editor/Models/IChangesModel.cs b/Editor/Collaborate/Models/IChangesModel.cs
similarity index 100%
rename from Editor/Models/IChangesModel.cs
rename to Editor/Collaborate/Models/IChangesModel.cs
diff --git a/Editor/Models/IChangesModel.cs.meta b/Editor/Collaborate/Models/IChangesModel.cs.meta
similarity index 100%
rename from Editor/Models/IChangesModel.cs.meta
rename to Editor/Collaborate/Models/IChangesModel.cs.meta
diff --git a/Editor/Models/IHistoryModel.cs b/Editor/Collaborate/Models/IHistoryModel.cs
similarity index 100%
rename from Editor/Models/IHistoryModel.cs
rename to Editor/Collaborate/Models/IHistoryModel.cs
diff --git a/Editor/Models/IHistoryModel.cs.meta b/Editor/Collaborate/Models/IHistoryModel.cs.meta
similarity index 100%
rename from Editor/Models/IHistoryModel.cs.meta
rename to Editor/Collaborate/Models/IHistoryModel.cs.meta
diff --git a/Editor/Models/IMainModel.cs b/Editor/Collaborate/Models/IMainModel.cs
similarity index 100%
rename from Editor/Models/IMainModel.cs
rename to Editor/Collaborate/Models/IMainModel.cs
diff --git a/Editor/Models/IMainModel.cs.meta b/Editor/Collaborate/Models/IMainModel.cs.meta
similarity index 100%
rename from Editor/Models/IMainModel.cs.meta
rename to Editor/Collaborate/Models/IMainModel.cs.meta
diff --git a/Editor/Models/IModel.cs b/Editor/Collaborate/Models/IModel.cs
similarity index 100%
rename from Editor/Models/IModel.cs
rename to Editor/Collaborate/Models/IModel.cs
diff --git a/Editor/Models/IModel.cs.meta b/Editor/Collaborate/Models/IModel.cs.meta
similarity index 100%
rename from Editor/Models/IModel.cs.meta
rename to Editor/Collaborate/Models/IModel.cs.meta
diff --git a/Editor/Models/IStartModel.cs b/Editor/Collaborate/Models/IStartModel.cs
similarity index 100%
rename from Editor/Models/IStartModel.cs
rename to Editor/Collaborate/Models/IStartModel.cs
diff --git a/Editor/Models/IStartModel.cs.meta b/Editor/Collaborate/Models/IStartModel.cs.meta
similarity index 100%
rename from Editor/Models/IStartModel.cs.meta
rename to Editor/Collaborate/Models/IStartModel.cs.meta
diff --git a/Editor/Models/MainModel.cs b/Editor/Collaborate/Models/MainModel.cs
similarity index 100%
rename from Editor/Models/MainModel.cs
rename to Editor/Collaborate/Models/MainModel.cs
diff --git a/Editor/Models/MainModel.cs.meta b/Editor/Collaborate/Models/MainModel.cs.meta
similarity index 100%
rename from Editor/Models/MainModel.cs.meta
rename to Editor/Collaborate/Models/MainModel.cs.meta
diff --git a/Editor/Models/Providers.meta b/Editor/Collaborate/Models/Providers.meta
similarity index 100%
rename from Editor/Models/Providers.meta
rename to Editor/Collaborate/Models/Providers.meta
diff --git a/Editor/Models/Providers/Collab.cs b/Editor/Collaborate/Models/Providers/Collab.cs
similarity index 100%
rename from Editor/Models/Providers/Collab.cs
rename to Editor/Collaborate/Models/Providers/Collab.cs
diff --git a/Editor/Models/Providers/Collab.cs.meta b/Editor/Collaborate/Models/Providers/Collab.cs.meta
similarity index 100%
rename from Editor/Models/Providers/Collab.cs.meta
rename to Editor/Collaborate/Models/Providers/Collab.cs.meta
diff --git a/Editor/Models/README.md b/Editor/Collaborate/Models/README.md
similarity index 100%
rename from Editor/Models/README.md
rename to Editor/Collaborate/Models/README.md
diff --git a/Editor/Models/README.md.meta b/Editor/Collaborate/Models/README.md.meta
similarity index 100%
rename from Editor/Models/README.md.meta
rename to Editor/Collaborate/Models/README.md.meta
diff --git a/Editor/Models/StartModel.cs b/Editor/Collaborate/Models/StartModel.cs
similarity index 100%
rename from Editor/Models/StartModel.cs
rename to Editor/Collaborate/Models/StartModel.cs
diff --git a/Editor/Models/StartModel.cs.meta b/Editor/Collaborate/Models/StartModel.cs.meta
similarity index 100%
rename from Editor/Models/StartModel.cs.meta
rename to Editor/Collaborate/Models/StartModel.cs.meta
diff --git a/Editor/Models/Structures.meta b/Editor/Collaborate/Models/Structures.meta
similarity index 100%
rename from Editor/Models/Structures.meta
rename to Editor/Collaborate/Models/Structures.meta
diff --git a/Editor/Models/Structures/ChangeEntry.cs b/Editor/Collaborate/Models/Structures/ChangeEntry.cs
similarity index 100%
rename from Editor/Models/Structures/ChangeEntry.cs
rename to Editor/Collaborate/Models/Structures/ChangeEntry.cs
diff --git a/Editor/Models/Structures/ChangeEntry.cs.meta b/Editor/Collaborate/Models/Structures/ChangeEntry.cs.meta
similarity index 100%
rename from Editor/Models/Structures/ChangeEntry.cs.meta
rename to Editor/Collaborate/Models/Structures/ChangeEntry.cs.meta
diff --git a/Editor/Models/Structures/ErrorInfo.cs b/Editor/Collaborate/Models/Structures/ErrorInfo.cs
similarity index 100%
rename from Editor/Models/Structures/ErrorInfo.cs
rename to Editor/Collaborate/Models/Structures/ErrorInfo.cs
diff --git a/Editor/Models/Structures/ErrorInfo.cs.meta b/Editor/Collaborate/Models/Structures/ErrorInfo.cs.meta
similarity index 100%
rename from Editor/Models/Structures/ErrorInfo.cs.meta
rename to Editor/Collaborate/Models/Structures/ErrorInfo.cs.meta
diff --git a/Editor/Models/Structures/HistoryEntry.cs b/Editor/Collaborate/Models/Structures/HistoryEntry.cs
similarity index 100%
rename from Editor/Models/Structures/HistoryEntry.cs
rename to Editor/Collaborate/Models/Structures/HistoryEntry.cs
diff --git a/Editor/Models/Structures/HistoryEntry.cs.meta b/Editor/Collaborate/Models/Structures/HistoryEntry.cs.meta
similarity index 100%
rename from Editor/Models/Structures/HistoryEntry.cs.meta
rename to Editor/Collaborate/Models/Structures/HistoryEntry.cs.meta
diff --git a/Editor/Models/Structures/IChangeEntry.cs b/Editor/Collaborate/Models/Structures/IChangeEntry.cs
similarity index 100%
rename from Editor/Models/Structures/IChangeEntry.cs
rename to Editor/Collaborate/Models/Structures/IChangeEntry.cs
diff --git a/Editor/Models/Structures/IChangeEntry.cs.meta b/Editor/Collaborate/Models/Structures/IChangeEntry.cs.meta
similarity index 100%
rename from Editor/Models/Structures/IChangeEntry.cs.meta
rename to Editor/Collaborate/Models/Structures/IChangeEntry.cs.meta
diff --git a/Editor/Models/Structures/IChangeEntryData.cs b/Editor/Collaborate/Models/Structures/IChangeEntryData.cs
similarity index 100%
rename from Editor/Models/Structures/IChangeEntryData.cs
rename to Editor/Collaborate/Models/Structures/IChangeEntryData.cs
diff --git a/Editor/Models/Structures/IChangeEntryData.cs.meta b/Editor/Collaborate/Models/Structures/IChangeEntryData.cs.meta
similarity index 100%
rename from Editor/Models/Structures/IChangeEntryData.cs.meta
rename to Editor/Collaborate/Models/Structures/IChangeEntryData.cs.meta
diff --git a/Editor/Models/Structures/IErrorInfo.cs b/Editor/Collaborate/Models/Structures/IErrorInfo.cs
similarity index 100%
rename from Editor/Models/Structures/IErrorInfo.cs
rename to Editor/Collaborate/Models/Structures/IErrorInfo.cs
diff --git a/Editor/Models/Structures/IErrorInfo.cs.meta b/Editor/Collaborate/Models/Structures/IErrorInfo.cs.meta
similarity index 100%
rename from Editor/Models/Structures/IErrorInfo.cs.meta
rename to Editor/Collaborate/Models/Structures/IErrorInfo.cs.meta
diff --git a/Editor/Models/Structures/IHistoryEntry.cs b/Editor/Collaborate/Models/Structures/IHistoryEntry.cs
similarity index 100%
rename from Editor/Models/Structures/IHistoryEntry.cs
rename to Editor/Collaborate/Models/Structures/IHistoryEntry.cs
diff --git a/Editor/Models/Structures/IHistoryEntry.cs.meta b/Editor/Collaborate/Models/Structures/IHistoryEntry.cs.meta
similarity index 100%
rename from Editor/Models/Structures/IHistoryEntry.cs.meta
rename to Editor/Collaborate/Models/Structures/IHistoryEntry.cs.meta
diff --git a/Editor/Models/Structures/IProgressInfo.cs b/Editor/Collaborate/Models/Structures/IProgressInfo.cs
similarity index 100%
rename from Editor/Models/Structures/IProgressInfo.cs
rename to Editor/Collaborate/Models/Structures/IProgressInfo.cs
diff --git a/Editor/Models/Structures/IProgressInfo.cs.meta b/Editor/Collaborate/Models/Structures/IProgressInfo.cs.meta
similarity index 100%
rename from Editor/Models/Structures/IProgressInfo.cs.meta
rename to Editor/Collaborate/Models/Structures/IProgressInfo.cs.meta
diff --git a/Editor/Models/Structures/ProgressInfo.cs b/Editor/Collaborate/Models/Structures/ProgressInfo.cs
similarity index 100%
rename from Editor/Models/Structures/ProgressInfo.cs
rename to Editor/Collaborate/Models/Structures/ProgressInfo.cs
diff --git a/Editor/Models/Structures/ProgressInfo.cs.meta b/Editor/Collaborate/Models/Structures/ProgressInfo.cs.meta
similarity index 100%
rename from Editor/Models/Structures/ProgressInfo.cs.meta
rename to Editor/Collaborate/Models/Structures/ProgressInfo.cs.meta
diff --git a/Editor/Presenters.meta b/Editor/Collaborate/Presenters.meta
similarity index 100%
rename from Editor/Presenters.meta
rename to Editor/Collaborate/Presenters.meta
diff --git a/Editor/Presenters/ChangesPresenter.cs b/Editor/Collaborate/Presenters/ChangesPresenter.cs
similarity index 100%
rename from Editor/Presenters/ChangesPresenter.cs
rename to Editor/Collaborate/Presenters/ChangesPresenter.cs
diff --git a/Editor/Presenters/ChangesPresenter.cs.meta b/Editor/Collaborate/Presenters/ChangesPresenter.cs.meta
similarity index 100%
rename from Editor/Presenters/ChangesPresenter.cs.meta
rename to Editor/Collaborate/Presenters/ChangesPresenter.cs.meta
diff --git a/Editor/Presenters/HistoryPresenter.cs b/Editor/Collaborate/Presenters/HistoryPresenter.cs
similarity index 100%
rename from Editor/Presenters/HistoryPresenter.cs
rename to Editor/Collaborate/Presenters/HistoryPresenter.cs
diff --git a/Editor/Presenters/HistoryPresenter.cs.meta b/Editor/Collaborate/Presenters/HistoryPresenter.cs.meta
similarity index 100%
rename from Editor/Presenters/HistoryPresenter.cs.meta
rename to Editor/Collaborate/Presenters/HistoryPresenter.cs.meta
diff --git a/Editor/Presenters/IChangesPresenter.cs b/Editor/Collaborate/Presenters/IChangesPresenter.cs
similarity index 100%
rename from Editor/Presenters/IChangesPresenter.cs
rename to Editor/Collaborate/Presenters/IChangesPresenter.cs
diff --git a/Editor/Presenters/IChangesPresenter.cs.meta b/Editor/Collaborate/Presenters/IChangesPresenter.cs.meta
similarity index 100%
rename from Editor/Presenters/IChangesPresenter.cs.meta
rename to Editor/Collaborate/Presenters/IChangesPresenter.cs.meta
diff --git a/Editor/Presenters/IHistoryPresenter.cs b/Editor/Collaborate/Presenters/IHistoryPresenter.cs
similarity index 100%
rename from Editor/Presenters/IHistoryPresenter.cs
rename to Editor/Collaborate/Presenters/IHistoryPresenter.cs
diff --git a/Editor/Presenters/IHistoryPresenter.cs.meta b/Editor/Collaborate/Presenters/IHistoryPresenter.cs.meta
similarity index 100%
rename from Editor/Presenters/IHistoryPresenter.cs.meta
rename to Editor/Collaborate/Presenters/IHistoryPresenter.cs.meta
diff --git a/Editor/Presenters/IMainPresenter.cs b/Editor/Collaborate/Presenters/IMainPresenter.cs
similarity index 100%
rename from Editor/Presenters/IMainPresenter.cs
rename to Editor/Collaborate/Presenters/IMainPresenter.cs
diff --git a/Editor/Presenters/IMainPresenter.cs.meta b/Editor/Collaborate/Presenters/IMainPresenter.cs.meta
similarity index 100%
rename from Editor/Presenters/IMainPresenter.cs.meta
rename to Editor/Collaborate/Presenters/IMainPresenter.cs.meta
diff --git a/Editor/Presenters/IPresenter.cs b/Editor/Collaborate/Presenters/IPresenter.cs
similarity index 100%
rename from Editor/Presenters/IPresenter.cs
rename to Editor/Collaborate/Presenters/IPresenter.cs
diff --git a/Editor/Presenters/IPresenter.cs.meta b/Editor/Collaborate/Presenters/IPresenter.cs.meta
similarity index 100%
rename from Editor/Presenters/IPresenter.cs.meta
rename to Editor/Collaborate/Presenters/IPresenter.cs.meta
diff --git a/Editor/Presenters/IStartPresenter.cs b/Editor/Collaborate/Presenters/IStartPresenter.cs
similarity index 100%
rename from Editor/Presenters/IStartPresenter.cs
rename to Editor/Collaborate/Presenters/IStartPresenter.cs
diff --git a/Editor/Presenters/IStartPresenter.cs.meta b/Editor/Collaborate/Presenters/IStartPresenter.cs.meta
similarity index 100%
rename from Editor/Presenters/IStartPresenter.cs.meta
rename to Editor/Collaborate/Presenters/IStartPresenter.cs.meta
diff --git a/Editor/Presenters/MainPresenter.cs b/Editor/Collaborate/Presenters/MainPresenter.cs
similarity index 100%
rename from Editor/Presenters/MainPresenter.cs
rename to Editor/Collaborate/Presenters/MainPresenter.cs
diff --git a/Editor/Presenters/MainPresenter.cs.meta b/Editor/Collaborate/Presenters/MainPresenter.cs.meta
similarity index 100%
rename from Editor/Presenters/MainPresenter.cs.meta
rename to Editor/Collaborate/Presenters/MainPresenter.cs.meta
diff --git a/Editor/Presenters/README.md b/Editor/Collaborate/Presenters/README.md
similarity index 100%
rename from Editor/Presenters/README.md
rename to Editor/Collaborate/Presenters/README.md
diff --git a/Editor/Presenters/README.md.meta b/Editor/Collaborate/Presenters/README.md.meta
similarity index 100%
rename from Editor/Presenters/README.md.meta
rename to Editor/Collaborate/Presenters/README.md.meta
diff --git a/Editor/Presenters/StartPresenter.cs b/Editor/Collaborate/Presenters/StartPresenter.cs
similarity index 100%
rename from Editor/Presenters/StartPresenter.cs
rename to Editor/Collaborate/Presenters/StartPresenter.cs
diff --git a/Editor/Presenters/StartPresenter.cs.meta b/Editor/Collaborate/Presenters/StartPresenter.cs.meta
similarity index 100%
rename from Editor/Presenters/StartPresenter.cs.meta
rename to Editor/Collaborate/Presenters/StartPresenter.cs.meta
diff --git a/Editor/Properties.meta b/Editor/Collaborate/Properties.meta
similarity index 100%
rename from Editor/Properties.meta
rename to Editor/Collaborate/Properties.meta
diff --git a/Editor/Properties/AssemblyInfo.cs b/Editor/Collaborate/Properties/AssemblyInfo.cs
similarity index 100%
rename from Editor/Properties/AssemblyInfo.cs
rename to Editor/Collaborate/Properties/AssemblyInfo.cs
diff --git a/Editor/Properties/AssemblyInfo.cs.meta b/Editor/Collaborate/Properties/AssemblyInfo.cs.meta
similarity index 100%
rename from Editor/Properties/AssemblyInfo.cs.meta
rename to Editor/Collaborate/Properties/AssemblyInfo.cs.meta
diff --git a/Editor/README.md b/Editor/Collaborate/README.md
similarity index 100%
rename from Editor/README.md
rename to Editor/Collaborate/README.md
diff --git a/Editor/README.md.meta b/Editor/Collaborate/README.md.meta
similarity index 100%
rename from Editor/README.md.meta
rename to Editor/Collaborate/README.md.meta
diff --git a/Editor/Settings.meta b/Editor/Collaborate/Settings.meta
similarity index 100%
rename from Editor/Settings.meta
rename to Editor/Collaborate/Settings.meta
diff --git a/Editor/Settings/CollabSetting.cs b/Editor/Collaborate/Settings/CollabSetting.cs
similarity index 100%
rename from Editor/Settings/CollabSetting.cs
rename to Editor/Collaborate/Settings/CollabSetting.cs
diff --git a/Editor/Settings/CollabSetting.cs.meta b/Editor/Collaborate/Settings/CollabSetting.cs.meta
similarity index 100%
rename from Editor/Settings/CollabSetting.cs.meta
rename to Editor/Collaborate/Settings/CollabSetting.cs.meta
diff --git a/Editor/Settings/CollabSettings.cs b/Editor/Collaborate/Settings/CollabSettings.cs
similarity index 100%
rename from Editor/Settings/CollabSettings.cs
rename to Editor/Collaborate/Settings/CollabSettings.cs
diff --git a/Editor/Settings/CollabSettings.cs.meta b/Editor/Collaborate/Settings/CollabSettings.cs.meta
similarity index 100%
rename from Editor/Settings/CollabSettings.cs.meta
rename to Editor/Collaborate/Settings/CollabSettings.cs.meta
diff --git a/Editor/Settings/CollabSettingsManager.cs b/Editor/Collaborate/Settings/CollabSettingsManager.cs
similarity index 100%
rename from Editor/Settings/CollabSettingsManager.cs
rename to Editor/Collaborate/Settings/CollabSettingsManager.cs
diff --git a/Editor/Settings/CollabSettingsManager.cs.meta b/Editor/Collaborate/Settings/CollabSettingsManager.cs.meta
similarity index 100%
rename from Editor/Settings/CollabSettingsManager.cs.meta
rename to Editor/Collaborate/Settings/CollabSettingsManager.cs.meta
diff --git a/Editor/Settings/CollabSettingsProvider.cs b/Editor/Collaborate/Settings/CollabSettingsProvider.cs
similarity index 100%
rename from Editor/Settings/CollabSettingsProvider.cs
rename to Editor/Collaborate/Settings/CollabSettingsProvider.cs
diff --git a/Editor/Settings/CollabSettingsProvider.cs.meta b/Editor/Collaborate/Settings/CollabSettingsProvider.cs.meta
similarity index 100%
rename from Editor/Settings/CollabSettingsProvider.cs.meta
rename to Editor/Collaborate/Settings/CollabSettingsProvider.cs.meta
diff --git a/Editor/Settings/README.md b/Editor/Collaborate/Settings/README.md
similarity index 100%
rename from Editor/Settings/README.md
rename to Editor/Collaborate/Settings/README.md
diff --git a/Editor/Settings/README.md.meta b/Editor/Collaborate/Settings/README.md.meta
similarity index 100%
rename from Editor/Settings/README.md.meta
rename to Editor/Collaborate/Settings/README.md.meta
diff --git a/Editor/Unity.CollabProxy.Editor.asmdef b/Editor/Collaborate/Unity.CollabProxy.Editor.asmdef
similarity index 100%
rename from Editor/Unity.CollabProxy.Editor.asmdef
rename to Editor/Collaborate/Unity.CollabProxy.Editor.asmdef
diff --git a/Editor/Unity.CollabProxy.Editor.asmdef.meta b/Editor/Collaborate/Unity.CollabProxy.Editor.asmdef.meta
similarity index 100%
rename from Editor/Unity.CollabProxy.Editor.asmdef.meta
rename to Editor/Collaborate/Unity.CollabProxy.Editor.asmdef.meta
diff --git a/Editor/UserInterface.meta b/Editor/Collaborate/UserInterface.meta
similarity index 100%
rename from Editor/UserInterface.meta
rename to Editor/Collaborate/UserInterface.meta
diff --git a/Editor/UserInterface/Bootstrap.cs b/Editor/Collaborate/UserInterface/Bootstrap.cs
similarity index 100%
rename from Editor/UserInterface/Bootstrap.cs
rename to Editor/Collaborate/UserInterface/Bootstrap.cs
diff --git a/Editor/UserInterface/Bootstrap.cs.meta b/Editor/Collaborate/UserInterface/Bootstrap.cs.meta
similarity index 100%
rename from Editor/UserInterface/Bootstrap.cs.meta
rename to Editor/Collaborate/UserInterface/Bootstrap.cs.meta
diff --git a/Editor/UserInterface/CollaborateWindow.cs b/Editor/Collaborate/UserInterface/CollaborateWindow.cs
similarity index 99%
rename from Editor/UserInterface/CollaborateWindow.cs
rename to Editor/Collaborate/UserInterface/CollaborateWindow.cs
index 9dcafdd..28e4dc1 100644
--- a/Editor/UserInterface/CollaborateWindow.cs
+++ b/Editor/Collaborate/UserInterface/CollaborateWindow.cs
@@ -22,8 +22,8 @@ internal class CollaborateWindow : EditorWindow
         public const string ContainerUssClassName = UssClassName + "__container";
 
         public const string PackagePath = "Packages/com.unity.collab-proxy";
-        public const string UserInterfacePath = PackagePath + "/Editor/UserInterface";
-        public const string ResourcePath = PackagePath + "/Editor/Assets";
+        public const string UserInterfacePath = PackagePath + "/Editor/Collaborate/UserInterface";
+        public const string ResourcePath = PackagePath + "/Editor/Collaborate/Assets";
         public const string LayoutPath = ResourcePath + "/Layouts";
         public const string StylePath = ResourcePath + "/Styles";
         public const string IconPath = ResourcePath + "/Icons";
@@ -87,7 +87,7 @@ void OnDisable()
             m_Models.ForEach(m => m.OnStop());
         }
 
-        void OnEnable()
+        void CreateGUI()
         {
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
             AssemblyReloadEvents.beforeAssemblyReload += OnBeforeAssemblyReload;
diff --git a/Editor/UserInterface/CollaborateWindow.cs.meta b/Editor/Collaborate/UserInterface/CollaborateWindow.cs.meta
similarity index 100%
rename from Editor/UserInterface/CollaborateWindow.cs.meta
rename to Editor/Collaborate/UserInterface/CollaborateWindow.cs.meta
diff --git a/Editor/UserInterface/README.md b/Editor/Collaborate/UserInterface/README.md
similarity index 100%
rename from Editor/UserInterface/README.md
rename to Editor/Collaborate/UserInterface/README.md
diff --git a/Editor/UserInterface/README.md.meta b/Editor/Collaborate/UserInterface/README.md.meta
similarity index 100%
rename from Editor/UserInterface/README.md.meta
rename to Editor/Collaborate/UserInterface/README.md.meta
diff --git a/Editor/UserInterface/ToolbarButton.cs b/Editor/Collaborate/UserInterface/ToolbarButton.cs
similarity index 100%
rename from Editor/UserInterface/ToolbarButton.cs
rename to Editor/Collaborate/UserInterface/ToolbarButton.cs
diff --git a/Editor/UserInterface/ToolbarButton.cs.meta b/Editor/Collaborate/UserInterface/ToolbarButton.cs.meta
similarity index 100%
rename from Editor/UserInterface/ToolbarButton.cs.meta
rename to Editor/Collaborate/UserInterface/ToolbarButton.cs.meta
diff --git a/Editor/UserInterface/WindowCache.cs b/Editor/Collaborate/UserInterface/WindowCache.cs
similarity index 100%
rename from Editor/UserInterface/WindowCache.cs
rename to Editor/Collaborate/UserInterface/WindowCache.cs
diff --git a/Editor/UserInterface/WindowCache.cs.meta b/Editor/Collaborate/UserInterface/WindowCache.cs.meta
similarity index 100%
rename from Editor/UserInterface/WindowCache.cs.meta
rename to Editor/Collaborate/UserInterface/WindowCache.cs.meta
diff --git a/Editor/Utilities.meta b/Editor/Collaborate/Utilities.meta
similarity index 100%
rename from Editor/Utilities.meta
rename to Editor/Collaborate/Utilities.meta
diff --git a/Editor/Utilities/ExtensionMethods.cs b/Editor/Collaborate/Utilities/ExtensionMethods.cs
similarity index 100%
rename from Editor/Utilities/ExtensionMethods.cs
rename to Editor/Collaborate/Utilities/ExtensionMethods.cs
diff --git a/Editor/Utilities/ExtensionMethods.cs.meta b/Editor/Collaborate/Utilities/ExtensionMethods.cs.meta
similarity index 100%
rename from Editor/Utilities/ExtensionMethods.cs.meta
rename to Editor/Collaborate/Utilities/ExtensionMethods.cs.meta
diff --git a/Editor/Utilities/MenuUtilities.cs b/Editor/Collaborate/Utilities/MenuUtilities.cs
similarity index 100%
rename from Editor/Utilities/MenuUtilities.cs
rename to Editor/Collaborate/Utilities/MenuUtilities.cs
diff --git a/Editor/Utilities/MenuUtilities.cs.meta b/Editor/Collaborate/Utilities/MenuUtilities.cs.meta
similarity index 100%
rename from Editor/Utilities/MenuUtilities.cs.meta
rename to Editor/Collaborate/Utilities/MenuUtilities.cs.meta
diff --git a/Editor/Utilities/OpenLinksUtility.cs b/Editor/Collaborate/Utilities/OpenLinksUtility.cs
similarity index 100%
rename from Editor/Utilities/OpenLinksUtility.cs
rename to Editor/Collaborate/Utilities/OpenLinksUtility.cs
diff --git a/Editor/Utilities/OpenLinksUtility.cs.meta b/Editor/Collaborate/Utilities/OpenLinksUtility.cs.meta
similarity index 100%
rename from Editor/Utilities/OpenLinksUtility.cs.meta
rename to Editor/Collaborate/Utilities/OpenLinksUtility.cs.meta
diff --git a/Editor/Utilities/README.md b/Editor/Collaborate/Utilities/README.md
similarity index 100%
rename from Editor/Utilities/README.md
rename to Editor/Collaborate/Utilities/README.md
diff --git a/Editor/Utilities/README.md.meta b/Editor/Collaborate/Utilities/README.md.meta
similarity index 100%
rename from Editor/Utilities/README.md.meta
rename to Editor/Collaborate/Utilities/README.md.meta
diff --git a/Editor/Utilities/StringUtility.cs b/Editor/Collaborate/Utilities/StringUtility.cs
similarity index 100%
rename from Editor/Utilities/StringUtility.cs
rename to Editor/Collaborate/Utilities/StringUtility.cs
diff --git a/Editor/Utilities/StringUtility.cs.meta b/Editor/Collaborate/Utilities/StringUtility.cs.meta
similarity index 100%
rename from Editor/Utilities/StringUtility.cs.meta
rename to Editor/Collaborate/Utilities/StringUtility.cs.meta
diff --git a/Editor/Utilities/Threading.cs b/Editor/Collaborate/Utilities/Threading.cs
similarity index 100%
rename from Editor/Utilities/Threading.cs
rename to Editor/Collaborate/Utilities/Threading.cs
diff --git a/Editor/Utilities/Threading.cs.meta b/Editor/Collaborate/Utilities/Threading.cs.meta
similarity index 100%
rename from Editor/Utilities/Threading.cs.meta
rename to Editor/Collaborate/Utilities/Threading.cs.meta
diff --git a/Editor/Utilities/TimeStamp.cs b/Editor/Collaborate/Utilities/TimeStamp.cs
similarity index 100%
rename from Editor/Utilities/TimeStamp.cs
rename to Editor/Collaborate/Utilities/TimeStamp.cs
diff --git a/Editor/Utilities/TimeStamp.cs.meta b/Editor/Collaborate/Utilities/TimeStamp.cs.meta
similarity index 100%
rename from Editor/Utilities/TimeStamp.cs.meta
rename to Editor/Collaborate/Utilities/TimeStamp.cs.meta
diff --git a/Editor/Views.meta b/Editor/Collaborate/Views.meta
similarity index 100%
rename from Editor/Views.meta
rename to Editor/Collaborate/Views.meta
diff --git a/Editor/Views/Adapters.meta b/Editor/Collaborate/Views/Adapters.meta
similarity index 100%
rename from Editor/Views/Adapters.meta
rename to Editor/Collaborate/Views/Adapters.meta
diff --git a/Editor/Views/Adapters/IAdapter.cs b/Editor/Collaborate/Views/Adapters/IAdapter.cs
similarity index 100%
rename from Editor/Views/Adapters/IAdapter.cs
rename to Editor/Collaborate/Views/Adapters/IAdapter.cs
diff --git a/Editor/Views/Adapters/IAdapter.cs.meta b/Editor/Collaborate/Views/Adapters/IAdapter.cs.meta
similarity index 100%
rename from Editor/Views/Adapters/IAdapter.cs.meta
rename to Editor/Collaborate/Views/Adapters/IAdapter.cs.meta
diff --git a/Editor/Views/Adapters/IAdapterObserver.cs b/Editor/Collaborate/Views/Adapters/IAdapterObserver.cs
similarity index 100%
rename from Editor/Views/Adapters/IAdapterObserver.cs
rename to Editor/Collaborate/Views/Adapters/IAdapterObserver.cs
diff --git a/Editor/Views/Adapters/IAdapterObserver.cs.meta b/Editor/Collaborate/Views/Adapters/IAdapterObserver.cs.meta
similarity index 100%
rename from Editor/Views/Adapters/IAdapterObserver.cs.meta
rename to Editor/Collaborate/Views/Adapters/IAdapterObserver.cs.meta
diff --git a/Editor/Views/Adapters/ListAdapters.meta b/Editor/Collaborate/Views/Adapters/ListAdapters.meta
similarity index 100%
rename from Editor/Views/Adapters/ListAdapters.meta
rename to Editor/Collaborate/Views/Adapters/ListAdapters.meta
diff --git a/Editor/Views/Adapters/ListAdapters/BaseListAdapter.cs b/Editor/Collaborate/Views/Adapters/ListAdapters/BaseListAdapter.cs
similarity index 100%
rename from Editor/Views/Adapters/ListAdapters/BaseListAdapter.cs
rename to Editor/Collaborate/Views/Adapters/ListAdapters/BaseListAdapter.cs
diff --git a/Editor/Views/Adapters/ListAdapters/BaseListAdapter.cs.meta b/Editor/Collaborate/Views/Adapters/ListAdapters/BaseListAdapter.cs.meta
similarity index 100%
rename from Editor/Views/Adapters/ListAdapters/BaseListAdapter.cs.meta
rename to Editor/Collaborate/Views/Adapters/ListAdapters/BaseListAdapter.cs.meta
diff --git a/Editor/Views/Adapters/ListAdapters/ConflictedChangeListAdapter.cs b/Editor/Collaborate/Views/Adapters/ListAdapters/ConflictedChangeListAdapter.cs
similarity index 100%
rename from Editor/Views/Adapters/ListAdapters/ConflictedChangeListAdapter.cs
rename to Editor/Collaborate/Views/Adapters/ListAdapters/ConflictedChangeListAdapter.cs
diff --git a/Editor/Views/Adapters/ListAdapters/ConflictedChangeListAdapter.cs.meta b/Editor/Collaborate/Views/Adapters/ListAdapters/ConflictedChangeListAdapter.cs.meta
similarity index 100%
rename from Editor/Views/Adapters/ListAdapters/ConflictedChangeListAdapter.cs.meta
rename to Editor/Collaborate/Views/Adapters/ListAdapters/ConflictedChangeListAdapter.cs.meta
diff --git a/Editor/Views/Adapters/ListAdapters/HistoryEntryChangeListAdapter.cs b/Editor/Collaborate/Views/Adapters/ListAdapters/HistoryEntryChangeListAdapter.cs
similarity index 100%
rename from Editor/Views/Adapters/ListAdapters/HistoryEntryChangeListAdapter.cs
rename to Editor/Collaborate/Views/Adapters/ListAdapters/HistoryEntryChangeListAdapter.cs
diff --git a/Editor/Views/Adapters/ListAdapters/HistoryEntryChangeListAdapter.cs.meta b/Editor/Collaborate/Views/Adapters/ListAdapters/HistoryEntryChangeListAdapter.cs.meta
similarity index 100%
rename from Editor/Views/Adapters/ListAdapters/HistoryEntryChangeListAdapter.cs.meta
rename to Editor/Collaborate/Views/Adapters/ListAdapters/HistoryEntryChangeListAdapter.cs.meta
diff --git a/Editor/Views/Adapters/ListAdapters/ToggleableChangeListAdapter.cs b/Editor/Collaborate/Views/Adapters/ListAdapters/ToggleableChangeListAdapter.cs
similarity index 100%
rename from Editor/Views/Adapters/ListAdapters/ToggleableChangeListAdapter.cs
rename to Editor/Collaborate/Views/Adapters/ListAdapters/ToggleableChangeListAdapter.cs
diff --git a/Editor/Views/Adapters/ListAdapters/ToggleableChangeListAdapter.cs.meta b/Editor/Collaborate/Views/Adapters/ListAdapters/ToggleableChangeListAdapter.cs.meta
similarity index 100%
rename from Editor/Views/Adapters/ListAdapters/ToggleableChangeListAdapter.cs.meta
rename to Editor/Collaborate/Views/Adapters/ListAdapters/ToggleableChangeListAdapter.cs.meta
diff --git a/Editor/Views/ChangesTabPageView.cs b/Editor/Collaborate/Views/ChangesTabPageView.cs
similarity index 100%
rename from Editor/Views/ChangesTabPageView.cs
rename to Editor/Collaborate/Views/ChangesTabPageView.cs
diff --git a/Editor/Views/ChangesTabPageView.cs.meta b/Editor/Collaborate/Views/ChangesTabPageView.cs.meta
similarity index 100%
rename from Editor/Views/ChangesTabPageView.cs.meta
rename to Editor/Collaborate/Views/ChangesTabPageView.cs.meta
diff --git a/Editor/Views/HistoryTabPageView.cs b/Editor/Collaborate/Views/HistoryTabPageView.cs
similarity index 100%
rename from Editor/Views/HistoryTabPageView.cs
rename to Editor/Collaborate/Views/HistoryTabPageView.cs
diff --git a/Editor/Views/HistoryTabPageView.cs.meta b/Editor/Collaborate/Views/HistoryTabPageView.cs.meta
similarity index 100%
rename from Editor/Views/HistoryTabPageView.cs.meta
rename to Editor/Collaborate/Views/HistoryTabPageView.cs.meta
diff --git a/Editor/Views/IChangesView.cs b/Editor/Collaborate/Views/IChangesView.cs
similarity index 100%
rename from Editor/Views/IChangesView.cs
rename to Editor/Collaborate/Views/IChangesView.cs
diff --git a/Editor/Views/IChangesView.cs.meta b/Editor/Collaborate/Views/IChangesView.cs.meta
similarity index 100%
rename from Editor/Views/IChangesView.cs.meta
rename to Editor/Collaborate/Views/IChangesView.cs.meta
diff --git a/Editor/Views/IHistoryView.cs b/Editor/Collaborate/Views/IHistoryView.cs
similarity index 100%
rename from Editor/Views/IHistoryView.cs
rename to Editor/Collaborate/Views/IHistoryView.cs
diff --git a/Editor/Views/IHistoryView.cs.meta b/Editor/Collaborate/Views/IHistoryView.cs.meta
similarity index 100%
rename from Editor/Views/IHistoryView.cs.meta
rename to Editor/Collaborate/Views/IHistoryView.cs.meta
diff --git a/Editor/Views/IMainView.cs b/Editor/Collaborate/Views/IMainView.cs
similarity index 100%
rename from Editor/Views/IMainView.cs
rename to Editor/Collaborate/Views/IMainView.cs
diff --git a/Editor/Views/IMainView.cs.meta b/Editor/Collaborate/Views/IMainView.cs.meta
similarity index 100%
rename from Editor/Views/IMainView.cs.meta
rename to Editor/Collaborate/Views/IMainView.cs.meta
diff --git a/Editor/Views/IStartView.cs b/Editor/Collaborate/Views/IStartView.cs
similarity index 100%
rename from Editor/Views/IStartView.cs
rename to Editor/Collaborate/Views/IStartView.cs
diff --git a/Editor/Views/IStartView.cs.meta b/Editor/Collaborate/Views/IStartView.cs.meta
similarity index 100%
rename from Editor/Views/IStartView.cs.meta
rename to Editor/Collaborate/Views/IStartView.cs.meta
diff --git a/Editor/Views/IView.cs b/Editor/Collaborate/Views/IView.cs
similarity index 100%
rename from Editor/Views/IView.cs
rename to Editor/Collaborate/Views/IView.cs
diff --git a/Editor/Views/IView.cs.meta b/Editor/Collaborate/Views/IView.cs.meta
similarity index 100%
rename from Editor/Views/IView.cs.meta
rename to Editor/Collaborate/Views/IView.cs.meta
diff --git a/Editor/Views/MainPageView.cs b/Editor/Collaborate/Views/MainPageView.cs
similarity index 100%
rename from Editor/Views/MainPageView.cs
rename to Editor/Collaborate/Views/MainPageView.cs
diff --git a/Editor/Views/MainPageView.cs.meta b/Editor/Collaborate/Views/MainPageView.cs.meta
similarity index 100%
rename from Editor/Views/MainPageView.cs.meta
rename to Editor/Collaborate/Views/MainPageView.cs.meta
diff --git a/Editor/Views/README.md b/Editor/Collaborate/Views/README.md
similarity index 100%
rename from Editor/Views/README.md
rename to Editor/Collaborate/Views/README.md
diff --git a/Editor/Views/README.md.meta b/Editor/Collaborate/Views/README.md.meta
similarity index 100%
rename from Editor/Views/README.md.meta
rename to Editor/Collaborate/Views/README.md.meta
diff --git a/Editor/Views/StartPageView.cs b/Editor/Collaborate/Views/StartPageView.cs
similarity index 100%
rename from Editor/Views/StartPageView.cs
rename to Editor/Collaborate/Views/StartPageView.cs
diff --git a/Editor/Views/StartPageView.cs.meta b/Editor/Collaborate/Views/StartPageView.cs.meta
similarity index 100%
rename from Editor/Views/StartPageView.cs.meta
rename to Editor/Collaborate/Views/StartPageView.cs.meta
diff --git a/Editor/PlasticSCM.meta b/Editor/PlasticSCM.meta
new file mode 100644
index 0000000..d4e7576
--- /dev/null
+++ b/Editor/PlasticSCM.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5ae383aa416ba14e800dff2526122ed
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssemblyInfo.cs b/Editor/PlasticSCM/AssemblyInfo.cs
new file mode 100644
index 0000000..645ab61
--- /dev/null
+++ b/Editor/PlasticSCM/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System.Runtime.CompilerServices;
+using UnityEngine;
+
+[assembly: InternalsVisibleTo("Unity.PlasticSCM.EditorTests")]
+[assembly: InternalsVisibleTo("Unity.PlasticSCM.DevTools")]
\ No newline at end of file
diff --git a/Editor/PlasticSCM/AssemblyInfo.cs.meta b/Editor/PlasticSCM/AssemblyInfo.cs.meta
new file mode 100644
index 0000000..3f98d5c
--- /dev/null
+++ b/Editor/PlasticSCM/AssemblyInfo.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d50ac3212a7ff5a4795bf609a2a20350
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetMenu.meta b/Editor/PlasticSCM/AssetMenu.meta
new file mode 100644
index 0000000..f795ce3
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d3f8e034331c39c4f823ac31228dc4d9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs b/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs
new file mode 100644
index 0000000..6df9db2
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs
@@ -0,0 +1,182 @@
+using PlasticGui;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.AssetMenu
+{
+    internal class AssetMenuItems
+    {
+        internal static void Enable(
+            IAssetMenuOperations operations,
+            IAssetStatusCache assetStatusCache,
+            AssetOperations.IAssetSelection assetsSelection)
+        {
+            mOperations = operations;
+            mAssetStatusCache = assetStatusCache;
+            mAssetsSelection = assetsSelection;
+
+            AddMenuItems();
+        }
+
+        internal static void Disable()
+        {
+            RemoveMenuItems();
+        }
+
+        static void AddMenuItems()
+        {
+            HandleMenuItem.AddMenuItem(
+                GetPlasticMenuItemName(PlasticLocalization.Name.PendingChangesPlasticMenu),
+                PENDING_CHANGES_MENU_ITEM_PRIORITY,
+                PendingChanges, ValidatePendingChanges);
+            HandleMenuItem.AddMenuItem(
+                GetPlasticMenuItemName(PlasticLocalization.Name.AddPlasticMenu),
+                ADD_MENU_ITEM_PRIORITY,
+                Add, ValidateAdd);
+            HandleMenuItem.AddMenuItem(
+                GetPlasticMenuItemName(PlasticLocalization.Name.CheckoutPlasticMenu),
+                CHECKOUT_MENU_ITEM_PRIORITY,
+                Checkout, ValidateCheckout);
+            HandleMenuItem.AddMenuItem(
+                GetPlasticMenuItemName(PlasticLocalization.Name.CheckinPlasticMenu),
+                CHECKIN_MENU_ITEM_PRIORITY,
+                Checkin, ValidateCheckin);
+            HandleMenuItem.AddMenuItem(
+                GetPlasticMenuItemName(PlasticLocalization.Name.UndoPlasticMenu),
+                UNDO_MENU_ITEM_PRIORITY,
+                Undo, ValidateUndo);
+            HandleMenuItem.AddMenuItem(
+                GetPlasticMenuItemName(PlasticLocalization.Name.DiffPlasticMenu),
+                GetPlasticShortcut.ForAssetDiff(),
+                DIFF_MENU_ITEM_PRIORITY,
+                Diff, ValidateDiff);
+            HandleMenuItem.AddMenuItem(
+                GetPlasticMenuItemName(PlasticLocalization.Name.HistoryPlasticMenu),
+                GetPlasticShortcut.ForHistory(),
+                HISTORY_MENU_ITEM_PRIORITY,
+                History, ValidateHistory);
+
+            HandleMenuItem.UpdateAllMenus();
+        }
+
+        static void RemoveMenuItems()
+        {
+            HandleMenuItem.RemoveMenuItem(
+                PlasticLocalization.GetString(PlasticLocalization.Name.PrefixPlasticMenu));
+
+            HandleMenuItem.UpdateAllMenus();
+        }
+
+        internal static void PendingChanges()
+        {
+            ShowWindow.Plastic();
+
+            mOperations.ShowPendingChanges();
+        }
+
+        internal static bool ValidatePendingChanges()
+        {
+            return true;
+        }
+
+        internal static void Add()
+        {
+            mOperations.Add();
+        }
+
+        static bool ValidateAdd()
+        {
+            return ShouldMenuItemBeEnabled(AssetMenuOperations.Add);
+        }
+
+        internal static void Checkout()
+        {
+            mOperations.Checkout();
+        }
+
+        static bool ValidateCheckout()
+        {
+            return ShouldMenuItemBeEnabled(AssetMenuOperations.Checkout);
+        }
+
+        internal static void Checkin()
+        {
+            mOperations.Checkin();
+        }
+
+        static bool ValidateCheckin()
+        {
+            return ShouldMenuItemBeEnabled(AssetMenuOperations.Checkin);
+        }
+
+        internal static void Undo()
+        {
+            mOperations.Undo();
+        }
+
+        static bool ValidateUndo()
+        {
+            return ShouldMenuItemBeEnabled(AssetMenuOperations.Undo);
+        }
+
+        internal static void Diff()
+        {
+            mOperations.ShowDiff();
+        }
+
+        static bool ValidateDiff()
+        {
+            return ShouldMenuItemBeEnabled(AssetMenuOperations.Diff);
+        }
+
+        internal static void History()
+        {
+            ShowWindow.Plastic();
+
+            mOperations.ShowHistory();
+        }
+
+        static bool ValidateHistory()
+        {
+            return ShouldMenuItemBeEnabled(AssetMenuOperations.History);
+        }
+
+        static bool ShouldMenuItemBeEnabled(AssetMenuOperations operation)
+        {
+            if (mOperations == null)
+                return false;
+
+            SelectedAssetGroupInfo selectedGroupInfo = SelectedAssetGroupInfo.
+                BuildFromAssetList(
+                    mAssetsSelection.GetSelectedAssets(),
+                    mAssetStatusCache);
+
+            AssetMenuOperations operations = AssetMenuUpdater.
+                GetAvailableMenuOperations(selectedGroupInfo);
+
+            return operations.HasFlag(operation);
+        }
+
+        static string GetPlasticMenuItemName(PlasticLocalization.Name name)
+        {
+            return string.Format("{0}/{1}",
+                PlasticLocalization.GetString(PlasticLocalization.Name.PrefixPlasticMenu),
+                PlasticLocalization.GetString(name));
+        }
+
+        static IAssetMenuOperations mOperations;
+        static IAssetStatusCache mAssetStatusCache;
+        static AssetOperations.IAssetSelection mAssetsSelection;
+
+        const int BASE_MENU_ITEM_PRIORITY = 19; // Puts Plastic SCM right below Create menu
+
+        // incrementing the "order" param by 11 causes the menu system to add a separator
+        const int PENDING_CHANGES_MENU_ITEM_PRIORITY = BASE_MENU_ITEM_PRIORITY;
+        const int ADD_MENU_ITEM_PRIORITY = PENDING_CHANGES_MENU_ITEM_PRIORITY + 11;
+        const int CHECKOUT_MENU_ITEM_PRIORITY = PENDING_CHANGES_MENU_ITEM_PRIORITY + 12;
+        const int CHECKIN_MENU_ITEM_PRIORITY = PENDING_CHANGES_MENU_ITEM_PRIORITY + 13;
+        const int UNDO_MENU_ITEM_PRIORITY = PENDING_CHANGES_MENU_ITEM_PRIORITY + 14;
+        const int DIFF_MENU_ITEM_PRIORITY = PENDING_CHANGES_MENU_ITEM_PRIORITY + 25;
+        const int HISTORY_MENU_ITEM_PRIORITY = PENDING_CHANGES_MENU_ITEM_PRIORITY + 26;
+    }
+}
diff --git a/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs.meta b/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs.meta
new file mode 100644
index 0000000..c70e70c
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/AssetMenuItems.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7c8a8e3e4456f9149905cf2c80aa41a9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs b/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs
new file mode 100644
index 0000000..fcc0c84
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs
@@ -0,0 +1,225 @@
+using System;
+using System.IO;
+
+using UnityEditor.VersionControl;
+
+using Codice;
+using Codice.Client.Commands.WkTree;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.AssetsOverlays;
+
+namespace Unity.PlasticSCM.Editor.AssetMenu
+{
+    [Flags]
+    internal enum AssetMenuOperations : byte
+    {
+        None =                   0,
+        Checkout =               1 << 0,
+        Diff =                   1 << 1,
+        History =                1 << 2,
+        Add =                    1 << 3,
+        Checkin =                1 << 4,
+        Undo =                   1 << 5,
+    }
+
+    internal class SelectedAssetGroupInfo
+    {
+        internal int SelectedCount;
+
+        internal bool IsControlledSelection;
+        internal bool IsCheckedInSelection;
+        internal bool IsCheckedOutSelection;
+        internal bool IsPrivateSelection;
+        internal bool IsAddedSelection;
+        internal bool IsFileSelection;
+        internal bool HasAnyAddedInSelection;
+        internal bool HasAnyRemoteLockedInSelection;
+
+        internal static SelectedAssetGroupInfo BuildFromAssetList(
+            AssetList assetList,
+            IAssetStatusCache statusCache)
+        {
+            bool isCheckedInSelection = true;
+            bool isControlledSelection = true;
+            bool isCheckedOutSelection = true;
+            bool isPrivateSelection = true;
+            bool isAddedSelection = true;
+            bool isFileSelection = true;
+            bool hasAnyAddedInSelection = false;
+            bool hasAnyRemoteLockedInSelection = false;
+
+            int selectedCount = 0;
+
+            foreach (Asset asset in assetList)
+            {
+                if (string.IsNullOrEmpty(asset.path))
+                    continue;
+
+                SelectedAssetGroupInfo singleFileGroupInfo = BuildFromSingleFile(
+                    asset.path,
+                    asset.isFolder,
+                    statusCache);
+
+                if (!singleFileGroupInfo.IsCheckedInSelection)
+                    isCheckedInSelection = false;
+
+                if (!singleFileGroupInfo.IsControlledSelection)
+                    isControlledSelection = false;
+
+                if (!singleFileGroupInfo.IsCheckedOutSelection)
+                    isCheckedOutSelection = false;
+
+                if (!singleFileGroupInfo.IsPrivateSelection)
+                    isPrivateSelection = false;
+
+                if (!singleFileGroupInfo.IsAddedSelection)
+                    isAddedSelection = false;
+
+                if (!singleFileGroupInfo.IsFileSelection)
+                    isFileSelection = false;
+
+                if (singleFileGroupInfo.HasAnyAddedInSelection)
+                    hasAnyAddedInSelection = true;
+
+                if (singleFileGroupInfo.HasAnyRemoteLockedInSelection)
+                    hasAnyRemoteLockedInSelection = true;
+
+                selectedCount++;
+            }
+
+            return new SelectedAssetGroupInfo()
+            {
+                IsCheckedInSelection = isCheckedInSelection,
+                IsCheckedOutSelection = isCheckedOutSelection,
+                IsControlledSelection = isControlledSelection,
+                IsPrivateSelection = isPrivateSelection,
+                IsAddedSelection = isAddedSelection,
+                IsFileSelection = isFileSelection,
+                HasAnyAddedInSelection = hasAnyAddedInSelection,
+                HasAnyRemoteLockedInSelection = hasAnyRemoteLockedInSelection,
+                SelectedCount = selectedCount,
+            };
+        }
+
+        internal static SelectedAssetGroupInfo BuildFromSingleFile(
+            string path,
+            bool isDirectory,
+            IAssetStatusCache statusCache)
+        {
+            bool isCheckedInSelection = true;
+            bool isControlledSelection = true;
+            bool isCheckedOutSelection = true;
+            bool isPrivateSelection = true;
+            bool isAddedSelection = true;
+            bool isFileSelection = true;
+            bool hasAnyAddedInSelection = false;
+            bool hasAnyRemoteLockedInSelection = false;
+
+            string assetPath = Path.GetFullPath(path);
+
+            WorkspaceTreeNode wkTreeNode =
+                Plastic.API.GetWorkspaceTreeNode(assetPath);
+
+            if (isDirectory)
+                isFileSelection = false;
+
+            if (CheckWorkspaceTreeNodeStatus.IsPrivate(wkTreeNode))
+                isControlledSelection = false;
+            else
+                isPrivateSelection = false;
+
+            if (CheckWorkspaceTreeNodeStatus.IsCheckedOut(wkTreeNode))
+                isCheckedInSelection = false;
+            else
+                isCheckedOutSelection = false;
+
+            if (CheckWorkspaceTreeNodeStatus.IsAdded(wkTreeNode))
+                hasAnyAddedInSelection = true;
+            else
+                isAddedSelection = false;
+
+            AssetsOverlays.AssetStatus assetStatus = statusCache.GetStatusForPath(assetPath);
+
+            if (ClassifyAssetStatus.IsLockedRemote(assetStatus))
+                hasAnyRemoteLockedInSelection = true;
+
+            return new SelectedAssetGroupInfo()
+            {
+                IsCheckedInSelection = isCheckedInSelection,
+                IsCheckedOutSelection = isCheckedOutSelection,
+                IsControlledSelection = isControlledSelection,
+                IsPrivateSelection = isPrivateSelection,
+                IsAddedSelection = isAddedSelection,
+                IsFileSelection = isFileSelection,
+                HasAnyAddedInSelection = hasAnyAddedInSelection,
+                HasAnyRemoteLockedInSelection = hasAnyRemoteLockedInSelection,
+                SelectedCount = 1,
+            };
+        }
+
+    }
+
+    internal interface IAssetMenuOperations
+    {
+        void ShowPendingChanges();
+        void Add();
+        void Checkout();
+        void Checkin();
+        void Undo();
+        void ShowDiff();
+        void ShowHistory();
+    }
+
+    internal static class AssetMenuUpdater
+    {
+        internal static AssetMenuOperations GetAvailableMenuOperations(
+            SelectedAssetGroupInfo info)
+        {
+            AssetMenuOperations result = AssetMenuOperations.None;
+
+            if (info.SelectedCount == 0)
+                return result;
+
+            if (info.IsControlledSelection &&
+                info.IsCheckedInSelection &&
+                info.IsFileSelection &&
+                !info.HasAnyRemoteLockedInSelection)
+            {
+                result |= AssetMenuOperations.Checkout;
+            }
+
+            if (info.IsFileSelection &&
+                info.IsPrivateSelection)
+            {
+                result |= AssetMenuOperations.Add;
+            }
+
+            if (info.IsFileSelection &&
+                info.IsControlledSelection &&
+                info.IsCheckedOutSelection)
+            {
+                result |= AssetMenuOperations.Checkin;
+                result |= AssetMenuOperations.Undo;
+            }
+
+            if (info.SelectedCount == 1 &&
+                info.IsControlledSelection &&
+                !info.HasAnyAddedInSelection &&
+                info.IsFileSelection)
+            {
+                result |= AssetMenuOperations.Diff;
+            }
+
+            if (info.SelectedCount == 1 &&
+                info.IsControlledSelection &&
+                !info.HasAnyAddedInSelection)
+            {
+                result |= AssetMenuOperations.History;
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs.meta b/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs.meta
new file mode 100644
index 0000000..49aae3a
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/AssetMenuOperations.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c456fa791a741a045a8a99ee73af2ae6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetMenu/AssetOperations.cs b/Editor/PlasticSCM/AssetMenu/AssetOperations.cs
new file mode 100644
index 0000000..a04ae6e
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/AssetOperations.cs
@@ -0,0 +1,320 @@
+using System.IO;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEditor.VersionControl;
+
+using Codice.Client.Commands;
+using Codice.Client.Commands.WkTree;
+using Codice.Client.Common;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using GluonGui;
+using PlasticGui;
+using PlasticGui.Gluon;
+using PlasticGui.WorkspaceWindow;
+using PlasticGui.WorkspaceWindow.Diff;
+using PlasticGui.WorkspaceWindow.Items;
+using Unity.PlasticSCM.Editor.AssetMenu.Dialogs;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.UI;
+
+using GluonCheckoutOperation = GluonGui.WorkspaceWindow.Views.WorkspaceExplorer.Explorer.Operations.CheckoutOperation;
+using GluonUndoCheckoutOperation = GluonGui.WorkspaceWindow.Views.WorkspaceExplorer.Explorer.Operations.UndoCheckoutOperation;
+using GluonAddoperation = GluonGui.WorkspaceWindow.Views.WorkspaceExplorer.Explorer.Operations.AddOperation;
+
+namespace Unity.PlasticSCM.Editor.AssetMenu
+{
+    internal class AssetOperations : IAssetMenuOperations
+    {
+        internal interface IAssetSelection
+        {
+            AssetList GetSelectedAssets();
+        }
+
+        internal AssetOperations(
+            WorkspaceInfo wkInfo,
+            IWorkspaceWindow workspaceWindow,
+            IViewSwitcher viewSwitcher,
+            IHistoryViewLauncher historyViewLauncher,
+            ViewHost viewHost,
+            NewIncomingChangesUpdater newIncomingChangesUpdater,
+            IAssetStatusCache assetStatusCache,
+            IMergeViewLauncher mergeViewLauncher,
+            IGluonViewSwitcher gluonViewSwitcher,
+            EditorWindow parentWindow,
+            IAssetSelection assetSelection,
+            bool isGluonMode)
+        {
+            mWkInfo = wkInfo;
+            mWorkspaceWindow = workspaceWindow;
+            mViewSwitcher = viewSwitcher;
+            mHistoryViewLauncher = historyViewLauncher;
+            mViewHost = viewHost;
+            mNewIncomingChangesUpdater = newIncomingChangesUpdater;
+            mAssetStatusCache = assetStatusCache;
+            mMergeViewLauncher = mergeViewLauncher;
+            mGluonViewSwitcher = gluonViewSwitcher;
+            mAssetSelection = assetSelection;
+            mIsGluonMode = isGluonMode;
+            mParentWindow = parentWindow;
+
+            mGuiMessage = new UnityPlasticGuiMessage(parentWindow);
+            mProgressControls = new EditorProgressControls(mGuiMessage);
+
+        }
+        void IAssetMenuOperations.ShowPendingChanges()
+        {
+            mViewSwitcher.ShowPendingChanges();
+        }
+
+        void IAssetMenuOperations.Add()
+        {
+            List<string> selectedPaths = GetSelectedPaths.ForOperation(
+                mAssetSelection,
+                mAssetStatusCache,
+                AssetMenuOperations.Add);
+
+            if (mIsGluonMode)
+            {
+                GluonAddoperation.Add(
+                    mViewHost,
+                    mProgressControls,
+                    mGuiMessage,
+                    selectedPaths.ToArray(),
+                    false,
+                    RefreshAsset.VersionControlCache);
+                return;
+            }
+
+            AddOperation.Run(
+                mWorkspaceWindow,
+                mProgressControls,
+                null,
+                null,
+                selectedPaths,
+                false,
+                mNewIncomingChangesUpdater,
+                RefreshAsset.VersionControlCache);
+        }
+
+        void IAssetMenuOperations.Checkout()
+        {
+            List<string> selectedPaths = GetSelectedPaths.ForOperation(
+                mAssetSelection,
+                mAssetStatusCache,
+                AssetMenuOperations.Checkout);
+
+            if (mIsGluonMode)
+            {
+                GluonCheckoutOperation.Checkout(
+                    mViewHost,
+                    mProgressControls,
+                    mGuiMessage,
+                    selectedPaths.ToArray(),
+                    false,
+                    RefreshAsset.VersionControlCache);
+                return;
+            }
+
+            CheckoutOperation.Checkout(
+                mWorkspaceWindow,
+                null,
+                mProgressControls,
+                selectedPaths,
+                mNewIncomingChangesUpdater,
+                RefreshAsset.VersionControlCache);
+        }
+
+        void IAssetMenuOperations.Checkin()
+        {
+            List<string> selectedPaths = GetSelectedPaths.ForOperation(
+                mAssetSelection,
+                mAssetStatusCache,
+                AssetMenuOperations.Checkin);
+
+            if (!CheckinDialog.CheckinPaths(
+                mWkInfo,
+                selectedPaths,
+                mAssetStatusCache,
+                mIsGluonMode,
+                mParentWindow,
+                mWorkspaceWindow,
+                mViewHost,
+                mGuiMessage,
+                mMergeViewLauncher,
+                mGluonViewSwitcher))
+                return;
+
+            RefreshAsset.UnityAssetDatabase();
+        }
+
+        void IAssetMenuOperations.Undo()
+        {
+            List<string> selectedPaths = GetSelectedPaths.ForOperation(
+                mAssetSelection,
+                mAssetStatusCache,
+                AssetMenuOperations.Undo);
+
+            SaveAssets.ForPathsWithoutConfirmation(selectedPaths);
+
+            if (mIsGluonMode)
+            {
+                GluonUndoCheckoutOperation.UndoCheckout(
+                    mWkInfo,
+                    mViewHost,
+                    mProgressControls,
+                    mGuiMessage,
+                    selectedPaths.ToArray(),
+                    false,
+                    RefreshAsset.UnityAssetDatabase);
+                return;
+            }
+
+            UndoCheckoutOperation.Run(
+                mWorkspaceWindow,
+                null,
+                mProgressControls,
+                selectedPaths,
+                mNewIncomingChangesUpdater,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        void IAssetMenuOperations.ShowDiff()
+        {
+            string selectedPath = AssetsSelection.GetSelectedPath(
+                mAssetSelection.GetSelectedAssets());
+
+            DiffInfo diffInfo = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    string symbolicName = GetSymbolicName(selectedPath);
+                    string extension = Path.GetExtension(selectedPath);
+
+                    diffInfo = Plastic.API.BuildDiffInfoForDiffWithPrevious(
+                        selectedPath, symbolicName, selectedPath, extension, mWkInfo);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.DisplayException(waiter.Exception);
+                        return;
+                    }
+
+                    DiffOperation.DiffWithPrevious(
+                        diffInfo,
+                        null,
+                        null);
+                });
+        }
+
+        void IAssetMenuOperations.ShowHistory()
+        {
+            AssetList assetList = mAssetSelection.GetSelectedAssets();
+
+            Asset selectedAsset = AssetsSelection.GetSelectedAsset(
+                assetList);
+            string selectedPath = AssetsSelection.GetSelectedPath(
+                assetList);
+
+            WorkspaceTreeNode node = Plastic.API.
+                GetWorkspaceTreeNode(selectedPath);
+
+            mHistoryViewLauncher.ShowHistoryView(
+                node.RepSpec,
+                node.RevInfo.ItemId,
+                selectedPath,
+                selectedAsset.isFolder);
+        }
+
+        static string GetSymbolicName(string selectedPath)
+        {
+            WorkspaceTreeNode node = Plastic.API.
+                GetWorkspaceTreeNode(selectedPath);
+
+            string branchName = string.Empty;
+            BranchInfoCache.TryGetBranchName(
+                node.RepSpec, node.RevInfo.BranchId, out branchName);
+
+            string userName = Plastic.API.GetUserName(
+                node.RepSpec.Server, node.RevInfo.Owner);
+
+            string symbolicName = string.Format(
+                "cs:{0}@{1} {2} {3}",
+                node.RevInfo.Changeset,
+                string.Format("br:{0}", branchName),
+                userName,
+                "Workspace Revision");
+
+            return symbolicName;
+        }
+
+        readonly WorkspaceInfo mWkInfo;
+        readonly IViewSwitcher mViewSwitcher;
+        readonly IHistoryViewLauncher mHistoryViewLauncher;
+        readonly IWorkspaceWindow mWorkspaceWindow;
+        readonly ViewHost mViewHost;
+        readonly NewIncomingChangesUpdater mNewIncomingChangesUpdater;
+        readonly IAssetStatusCache mAssetStatusCache;
+        readonly IMergeViewLauncher mMergeViewLauncher;
+        readonly IGluonViewSwitcher mGluonViewSwitcher;
+        readonly bool mIsGluonMode;
+        readonly GuiMessage.IGuiMessage mGuiMessage;
+        readonly EditorProgressControls mProgressControls;
+        readonly EditorWindow mParentWindow;
+        readonly IAssetSelection mAssetSelection;
+
+        static class GetSelectedPaths
+        {
+            internal static List<string> ForOperation(
+                IAssetSelection assetSelection,
+                IAssetStatusCache assetStatusCache,
+                AssetMenuOperations operation)
+            {
+                List<string> selectedPaths = AssetsSelection.GetSelectedPaths(
+                    assetSelection.GetSelectedAssets());
+
+                List<string> result = new List<string>(selectedPaths);
+
+                foreach (string path in selectedPaths)
+                {
+                    if (MetaPath.IsMetaPath(path))
+                        continue;
+
+                    string metaPath = MetaPath.GetMetaPath(path);
+
+                    if (!File.Exists(metaPath))
+                        continue;
+
+                    if (result.Contains(metaPath))
+                        continue;
+
+                    if (!IsApplicableForOperation(
+                        metaPath, false, operation, assetStatusCache))
+                        continue;
+
+                    result.Add(metaPath);
+                }
+
+                return result;
+            }
+
+            static bool IsApplicableForOperation(
+                string path,
+                bool isDirectory,
+                AssetMenuOperations operation,
+                IAssetStatusCache assetStatusCache)
+            {
+                SelectedAssetGroupInfo info = SelectedAssetGroupInfo.BuildFromSingleFile(
+                    path, isDirectory, assetStatusCache);
+
+                return AssetMenuUpdater.GetAvailableMenuOperations(info).HasFlag(operation);
+            }
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetMenu/AssetOperations.cs.meta b/Editor/PlasticSCM/AssetMenu/AssetOperations.cs.meta
new file mode 100644
index 0000000..d6ca916
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/AssetOperations.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2c8b452bcd72d8248a3297ff656f0a7a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetMenu/AssetsSelection.cs b/Editor/PlasticSCM/AssetMenu/AssetsSelection.cs
new file mode 100644
index 0000000..53a7b6e
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/AssetsSelection.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using UnityEditor.VersionControl;
+
+namespace Unity.PlasticSCM.Editor.AssetMenu
+{
+    internal static class AssetsSelection
+    {
+        internal static Asset GetSelectedAsset(AssetList assetList)
+        {
+            if (assetList.Count == 0)
+                return null;
+
+            return assetList[0];
+        }
+
+        internal static string GetSelectedPath(AssetList assetList)
+        {
+            if (assetList.Count == 0)
+                return null;
+
+            return Path.GetFullPath(assetList[0].path);
+        }
+
+        internal static List<string> GetSelectedPaths(AssetList selectedAssets)
+        {
+            List<string> result = new List<string>();
+
+            foreach (Asset asset in selectedAssets)
+            {
+                string fullPath = Path.GetFullPath(asset.path);
+                result.Add(fullPath);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetMenu/AssetsSelection.cs.meta b/Editor/PlasticSCM/AssetMenu/AssetsSelection.cs.meta
new file mode 100644
index 0000000..314aee8
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/AssetsSelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1686ac2e1d109ed43bf2dec74fed784f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetMenu/Dialogs.meta b/Editor/PlasticSCM/AssetMenu/Dialogs.meta
new file mode 100644
index 0000000..8148c12
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/Dialogs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f5d6c6c129fff0140a040d43aedb9547
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialog.cs b/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialog.cs
new file mode 100644
index 0000000..e8a9388
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialog.cs
@@ -0,0 +1,383 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using Codice.Client.Common;
+using Codice.CM.Common;
+using GluonGui;
+using PlasticGui;
+using PlasticGui.Gluon;
+
+using Unity.PlasticSCM.Editor.AssetsOverlays;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.AssetMenu.Dialogs
+{
+    internal class CheckinDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 700, 450);
+            }
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.CheckinChanges);
+        }
+
+        internal static bool CheckinPaths(
+            WorkspaceInfo wkInfo,
+            List<string> paths,
+            IAssetStatusCache assetStatusCache,
+            bool isGluonMode,
+            EditorWindow parentWindow,
+            IWorkspaceWindow workspaceWindow,
+            ViewHost viewHost,
+            GuiMessage.IGuiMessage guiMessage,
+            IMergeViewLauncher mergeViewLauncher,
+            IGluonViewSwitcher gluonViewSwitcher)
+        {
+            MetaCache metaCache = new MetaCache();
+            metaCache.Build(paths);
+
+            CheckinDialog dialog = Create(
+                wkInfo,
+                paths,
+                assetStatusCache,
+                metaCache,
+                isGluonMode,
+                new ProgressControlsForDialogs(),
+                workspaceWindow,
+                viewHost,
+                guiMessage,
+                mergeViewLauncher,
+                gluonViewSwitcher);
+
+            return dialog.RunModal(parentWindow) == ResponseType.Ok;
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(
+                PlasticLocalization.Name.CheckinComment));
+
+            GUI.SetNextControlName(CHECKIN_TEXTAREA_NAME);
+
+            mComment = GUILayout.TextArea(
+                mComment,
+                EditorStyles.textArea,
+                GUILayout.MinHeight(120));
+
+            if (!mTextAreaFocused)
+            {
+                EditorGUI.FocusTextInControl(CHECKIN_TEXTAREA_NAME);
+                mTextAreaFocused = true;
+            }
+
+            Title(PlasticLocalization.GetString(PlasticLocalization.Name.Files));
+
+            DoFileList(
+                mWkInfo,
+                mPaths,
+                mAssetStatusCache,
+                mMetaCache);
+
+            DrawProgressForDialogs.For(
+                mProgressControls.ProgressData);
+
+            DoButtonsArea();
+
+            mProgressControls.ForcedUpdateProgress(this);
+        }
+
+        void DoFileList(
+            WorkspaceInfo wkInfo,
+            List<string> paths,
+            IAssetStatusCache assetStatusCache,
+            MetaCache metaCache)
+        {
+            mFileListScrollPosition = GUILayout.BeginScrollView(
+                mFileListScrollPosition,
+                EditorStyles.helpBox,
+                GUILayout.ExpandHeight(true));
+
+            foreach (string path in paths)
+            {
+                if (MetaPath.IsMetaPath(path))
+                    continue;
+
+                Texture fileIcon = Directory.Exists(path) ?
+                        Images.GetDirectoryIcon() :
+                        Images.GetFileIcon(path);
+
+                string label = WorkspacePath.GetWorkspaceRelativePath(
+                    wkInfo.ClientPath, path);
+
+                if (metaCache.HasMeta(path))
+                    label = string.Concat(label, UnityConstants.TREEVIEW_META_LABEL);
+
+                GUIContent content = new GUIContent(
+                     label, fileIcon);
+
+                GUILayout.Label(
+                    content,
+                    GUILayout.Height(UnityConstants.TREEVIEW_ROW_HEIGHT));
+
+                Rect iconRect = GUILayoutUtility.GetLastRect();
+
+                DoStatusOverlays(
+                    iconRect,
+                    assetStatusCache,
+                    path);
+            }
+
+            GUILayout.EndScrollView();
+        }
+
+        static void DoStatusOverlays(
+            Rect iconRect,
+            IAssetStatusCache assetStatusCache,
+            string path)
+        {
+            AssetsOverlays.AssetStatus statusesToDraw = DrawAssetOverlay.GetStatusesToDraw(
+                assetStatusCache.GetStatusForPath(path));
+
+            foreach (AssetsOverlays.AssetStatus status in Enum.GetValues(typeof(AssetsOverlays.AssetStatus)))
+            {
+                if (status == AssetsOverlays.AssetStatus.None)
+                    continue;
+
+                if (!statusesToDraw.HasFlag(status))
+                    continue;
+
+                GetChangesOverlayIcon.Data overlayIconData =
+                    GetChangesOverlayIcon.ForAssetStatus(status);
+
+                if (overlayIconData != null)
+                {
+                    Rect overlayIconRect = new Rect(
+                        iconRect.x + overlayIconData.XOffset,
+                        iconRect.y + overlayIconData.YOffset,
+                        overlayIconData.Size, overlayIconData.Size);
+
+                    GUI.DrawTexture(
+                        overlayIconRect, overlayIconData.Texture,
+                        ScaleMode.ScaleToFit);
+                }
+            }
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoCheckinButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoCheckinButton();
+            }
+        }
+
+        void DoCheckinButton()
+        {
+            GUI.enabled = !string.IsNullOrEmpty(mComment) && !mIsRunningCheckin;
+
+            try
+            {
+                if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CheckinButton)))
+                    return;
+            }
+            finally
+            {
+                GUI.enabled = true;
+            }
+
+            OkButtonWithCheckinAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        void OkButtonWithCheckinAction()
+        {
+            bool isCancelled;
+            SaveAssets.ForPathsWithConfirmation(mPaths, out isCancelled);
+
+            if (isCancelled)
+                return;
+
+            mIsRunningCheckin = true;
+
+            mPaths.AddRange(mMetaCache.GetExistingMeta(mPaths));
+
+            if (mIsGluonMode)
+            {
+                CheckinDialogOperations.CheckinPathsPartial(
+                    mWkInfo,
+                    mPaths,
+                    mComment,
+                    mViewHost,
+                    this,
+                    mGuiMessage,
+                    mProgressControls,
+                    mGluonViewSwitcher);
+                return;
+            }
+
+            CheckinDialogOperations.CheckinPaths(
+                mWkInfo,
+                mPaths,
+                mComment,
+                mWorkspaceWindow,
+                this,
+                mGuiMessage,
+                mProgressControls,
+                mMergeViewLauncher);
+        }
+
+        static CheckinDialog Create(
+            WorkspaceInfo wkInfo,
+            List<string> paths,
+            IAssetStatusCache assetStatusCache,
+            MetaCache metaCache,
+            bool isGluonMode,
+            ProgressControlsForDialogs progressControls,
+            IWorkspaceWindow workspaceWindow,
+            ViewHost viewHost,
+            GuiMessage.IGuiMessage guiMessage,
+            IMergeViewLauncher mergeViewLauncher,
+            IGluonViewSwitcher gluonViewSwitcher)
+        {
+            var instance = CreateInstance<CheckinDialog>();
+            instance.IsResizable = true;
+            instance.minSize = new Vector2(520, 370);
+            instance.mWkInfo = wkInfo;
+            instance.mPaths = paths;
+            instance.mAssetStatusCache = assetStatusCache;
+            instance.mMetaCache = metaCache;
+            instance.mIsGluonMode = isGluonMode;
+            instance.mProgressControls = progressControls;
+            instance.mWorkspaceWindow = workspaceWindow;
+            instance.mViewHost = viewHost;
+            instance.mGuiMessage = guiMessage;
+            instance.mMergeViewLauncher = mergeViewLauncher;
+            instance.mGluonViewSwitcher = gluonViewSwitcher;
+            instance.mEnterKeyAction = instance.OkButtonAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            return instance;
+        }
+
+        WorkspaceInfo mWkInfo;
+        List<string> mPaths;
+        IAssetStatusCache mAssetStatusCache;
+        MetaCache mMetaCache;
+        bool mIsGluonMode;
+        bool mTextAreaFocused;
+        string mComment;
+
+        bool mIsRunningCheckin;
+        Vector2 mFileListScrollPosition;
+
+        ProgressControlsForDialogs mProgressControls;
+
+        IWorkspaceWindow mWorkspaceWindow;
+        ViewHost mViewHost;
+        IMergeViewLauncher mMergeViewLauncher;
+        IGluonViewSwitcher mGluonViewSwitcher;
+        GuiMessage.IGuiMessage mGuiMessage;
+
+        const string CHECKIN_TEXTAREA_NAME = "checkin_textarea";
+
+        class MetaCache
+        {
+            internal bool HasMeta(string path)
+            {
+                return mCache.Contains(MetaPath.GetMetaPath(path));
+            }
+
+            internal List<string> GetExistingMeta(List<string> paths)
+            {
+                List<string> result = new List<string>();
+
+                foreach (string path in paths)
+                {
+                    string metaPath = MetaPath.GetMetaPath(path);
+
+                    if (!mCache.Contains(metaPath))
+                        continue;
+
+                    result.Add(metaPath);
+                }
+
+                return result;
+            }
+
+            internal void Build(List<string> paths)
+            {
+                HashSet<string> indexedKeys = BuildIndexedKeys(paths);
+
+                for (int i = paths.Count - 1; i >= 0; i--)
+                {
+                    string currentPath = paths[i];
+
+                    if (!MetaPath.IsMetaPath(currentPath))
+                        continue;
+
+                    string realPath = MetaPath.GetPathFromMetaPath(currentPath);
+
+                    if (!indexedKeys.Contains(realPath))
+                        continue;
+
+                    // found foo.c and foo.c.meta
+                    // with the same chage types - move .meta to cache
+                    mCache.Add(currentPath);
+                    paths.RemoveAt(i);
+                }
+            }
+
+            static HashSet<string> BuildIndexedKeys(List<string> paths)
+            {
+                HashSet<string> result = new HashSet<string>();
+
+                foreach (string path in paths)
+                {
+                    if (MetaPath.IsMetaPath(path))
+                        continue;
+
+                    result.Add(path);
+                }
+
+                return result;
+            }
+
+            HashSet<string> mCache =
+                new HashSet<string>();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialog.cs.meta b/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialog.cs.meta
new file mode 100644
index 0000000..207c66f
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 678db227e4ffec949980d309c0532b08
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialogOperations.cs b/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialogOperations.cs
new file mode 100644
index 0000000..07fc8c0
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialogOperations.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands.CheckIn;
+using Codice.Client.Common;
+using Codice.Client.Common.Threading;
+using Codice.Client.GameUI.Checkin;
+using Codice.CM.Common;
+
+using GluonGui;
+
+using PlasticGui;
+using PlasticGui.Gluon;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+
+namespace Unity.PlasticSCM.Editor.AssetMenu.Dialogs
+{
+    internal static class CheckinDialogOperations
+    {
+        internal static void CheckinPaths(
+            WorkspaceInfo wkInfo,
+            List<string> paths,
+            string comment,
+            IWorkspaceWindow workspaceWindow,
+            CheckinDialog dialog,
+            GuiMessage.IGuiMessage guiMessage,
+            IProgressControls progressControls,
+            IMergeViewLauncher mergeViewLauncher)
+        {
+            BaseCommandsImpl baseCommands = new BaseCommandsImpl();
+
+            progressControls.ShowProgress("Checkin in files");
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(50);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    CheckinParams ciParams = new CheckinParams();
+                    ciParams.paths = paths.ToArray();
+                    ciParams.comment = comment;
+                    ciParams.time = DateTime.MinValue;
+                    ciParams.flags = CheckinFlags.Recurse | CheckinFlags.ProcessSymlinks;
+
+                    baseCommands.CheckIn(ciParams);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    progressControls.HideProgress();
+                    ((IPlasticDialogCloser)dialog).CloseDialog();
+
+                    if (waiter.Exception is CmClientMergeNeededException ||
+                        waiter.Exception is CmClientUpdateMergeNeededException)
+                    {
+                        // we need to explicitly call EditorWindow.Close() to ensure
+                        // that the dialog is closed before asking the user
+                        dialog.Close();
+
+                        if (!UserWantsToShowIncomingView(guiMessage))
+                            return;
+
+                        ShowIncomingChanges.FromCheckin(
+                            wkInfo,
+                            mergeViewLauncher,
+                            progressControls);
+
+                        return;
+                    }
+
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.DisplayException(waiter.Exception);
+                        return;
+                    }
+
+                    workspaceWindow.RefreshView(ViewType.PendingChangesView);
+                    workspaceWindow.RefreshView(ViewType.HistoryView);
+                });
+        }
+
+        internal static void CheckinPathsPartial(
+            WorkspaceInfo wkInfo,
+            List<string> paths,
+            string comment,
+            ViewHost viewHost,
+            CheckinDialog dialog,
+            GuiMessage.IGuiMessage guiMessage,
+            IProgressControls progressControls,
+            IGluonViewSwitcher gluonViewSwitcher)
+        {
+            BaseCommandsImpl baseCommands = new BaseCommandsImpl();
+
+            progressControls.ShowProgress(PlasticLocalization.GetString(
+                PlasticLocalization.Name.CheckinInFilesProgress));
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(50);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    baseCommands.PartialCheckin(wkInfo, paths, comment);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    progressControls.HideProgress();
+
+                    ((IPlasticDialogCloser)dialog).CloseDialog();
+
+                    if (waiter.Exception is CheckinConflictsException)
+                    {
+                        // we need to explicitly call EditorWindow.Close() to ensure
+                        // that the dialog is closed before asking the user
+                        dialog.Close();
+
+                        if (!UserWantsToShowIncomingView(guiMessage))
+                            return;
+
+                        gluonViewSwitcher.ShowIncomingChangesView();
+                        return;
+                    }
+
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.DisplayException(waiter.Exception);
+                        return;
+                    }
+
+                    viewHost.RefreshView(ViewType.CheckinView);
+                    viewHost.RefreshView(ViewType.HistoryView);
+                });
+        }
+
+        static bool UserWantsToShowIncomingView(GuiMessage.IGuiMessage guiMessage)
+        {
+            GuiMessage.GuiMessageResponseButton result = guiMessage.ShowQuestion(
+                PlasticLocalization.GetString(PlasticLocalization.Name.CheckinConflictsTitle),
+                PlasticLocalization.GetString(PlasticLocalization.Name.UnityCheckinConflictsExplanation),
+                "",
+                PlasticLocalization.GetString(PlasticLocalization.Name.CheckinShowIncomingChangesView),
+                PlasticLocalization.GetString(PlasticLocalization.Name.CancelButton),
+                false);
+
+            return result == GuiMessage.GuiMessageResponseButton.Second;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialogOperations.cs.meta b/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialogOperations.cs.meta
new file mode 100644
index 0000000..13761ab
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/Dialogs/CheckinDialogOperations.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c44a2ac668da0a04d9e567739215b2eb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetMenu/ProjectViewAssetSelection.cs b/Editor/PlasticSCM/AssetMenu/ProjectViewAssetSelection.cs
new file mode 100644
index 0000000..da5b847
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/ProjectViewAssetSelection.cs
@@ -0,0 +1,12 @@
+using UnityEditor.VersionControl;
+
+namespace Unity.PlasticSCM.Editor.AssetMenu
+{
+    internal class ProjectViewAssetSelection : AssetOperations.IAssetSelection
+    {
+        AssetList AssetOperations.IAssetSelection.GetSelectedAssets()
+        {
+            return Provider.GetAssetListFromSelection();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetMenu/ProjectViewAssetSelection.cs.meta b/Editor/PlasticSCM/AssetMenu/ProjectViewAssetSelection.cs.meta
new file mode 100644
index 0000000..d9c9ac9
--- /dev/null
+++ b/Editor/PlasticSCM/AssetMenu/ProjectViewAssetSelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b8a49294ba135a2408fd1b26bcda6f97
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays.meta b/Editor/PlasticSCM/AssetOverlays.meta
new file mode 100644
index 0000000..5ae2841
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 491c192b16f732b4983b4a539908ad32
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays/AssetStatus.cs b/Editor/PlasticSCM/AssetOverlays/AssetStatus.cs
new file mode 100644
index 0000000..f45dc94
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/AssetStatus.cs
@@ -0,0 +1,71 @@
+using System;
+
+namespace Unity.PlasticSCM.Editor.AssetsOverlays
+{
+    [Flags]
+    internal enum AssetStatus
+    {
+        None            = 0,
+        Private         = 1 << 0,
+        Ignored         = 1 << 2,
+        Added           = 1 << 3,
+        Checkout        = 1 << 4,
+        Controlled      = 1 << 5,
+        UpToDate        = 1 << 6,
+        OutOfDate       = 1 << 7,
+        Conflicted      = 1 << 8,
+        DeletedOnServer = 1 << 9,
+        Locked          = 1 << 10,
+        LockedRemote    = 1 << 11,
+    }
+
+    internal class LockStatusData
+    {
+        internal readonly AssetStatus Status;
+        internal readonly string LockedBy;
+        internal readonly string WorkspaceName;
+
+        internal LockStatusData(
+            AssetStatus status,
+            string lockedBy,
+            string workspaceName)
+        {
+            Status = status;
+            LockedBy = lockedBy;
+            WorkspaceName = workspaceName;
+        }
+    }
+
+    internal class ClassifyAssetStatus
+    {
+        internal static bool IsControlled(AssetStatus status)
+        {
+            return ContainsAny(status, AssetStatus.Controlled);
+        }
+
+        internal static bool IsLockedRemote(AssetStatus status)
+        {
+            return ContainsAny(status, AssetStatus.LockedRemote);
+        }
+
+        internal static bool IsConflicted(AssetStatus status)
+        {
+            return ContainsAny(status, AssetStatus.Conflicted);
+        }
+
+        internal static bool IsAdded(AssetStatus status)
+        {
+            return ContainsAny(status, AssetStatus.Added);
+        }
+
+        internal static bool IsCheckedOut(AssetStatus status)
+        {
+            return ContainsAny(status, AssetStatus.Checkout);
+        }
+
+        static bool ContainsAny(AssetStatus status, AssetStatus matchTo)
+        {
+            return (status & matchTo) != AssetStatus.None;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetOverlays/AssetStatus.cs.meta b/Editor/PlasticSCM/AssetOverlays/AssetStatus.cs.meta
new file mode 100644
index 0000000..602a0a9
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/AssetStatus.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 062535eac3e5dd1409b6a50b0d043e2c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache.meta b/Editor/PlasticSCM/AssetOverlays/Cache.meta
new file mode 100644
index 0000000..1001b1e
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a94a55dca335c547ac65bd4b85d2a55
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/AssetStatusCache.cs b/Editor/PlasticSCM/AssetOverlays/Cache/AssetStatusCache.cs
new file mode 100644
index 0000000..eb3ca3b
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/AssetStatusCache.cs
@@ -0,0 +1,98 @@
+using System;
+using System.IO;
+
+using UnityEditor;
+
+using Codice.CM.Common;
+
+namespace Unity.PlasticSCM.Editor.AssetsOverlays.Cache
+{
+    internal interface IAssetStatusCache
+    {
+        AssetStatus GetStatusForPath(string fullPath);
+        AssetStatus GetStatusForGuid(string guid);
+        LockStatusData GetLockStatusData(string guid);
+        LockStatusData GetLockStatusDataForPath(string path);
+        void Clear();
+    }
+
+    internal class AssetStatusCache : IAssetStatusCache
+    {
+        internal AssetStatusCache(
+            WorkspaceInfo wkInfo,
+            bool isGluonMode,
+            Action repaintProjectWindow)
+        {
+            mLocalStatusCache = new LocalStatusCache(wkInfo);
+
+            mRemoteStatusCache = new RemoteStatusCache(
+                wkInfo,
+                isGluonMode,
+                repaintProjectWindow);
+
+            mLockStatusCache = new LockStatusCache(
+                wkInfo,
+                repaintProjectWindow);
+        }
+
+        AssetStatus IAssetStatusCache.GetStatusForPath(string fullPath)
+        {
+            AssetStatus localStatus = mLocalStatusCache.GetStatus(fullPath);
+
+            if (!ClassifyAssetStatus.IsControlled(localStatus))
+                return localStatus;
+
+            AssetStatus remoteStatus = mRemoteStatusCache.GetStatus(fullPath);
+
+            AssetStatus lockStatus = mLockStatusCache.GetStatus(fullPath);
+
+            return localStatus | remoteStatus | lockStatus;
+        }
+
+        AssetStatus IAssetStatusCache.GetStatusForGuid(string guid)
+        {
+            string fullPath = GetAssetPath(guid);
+
+            if (string.IsNullOrEmpty(fullPath))
+                return AssetStatus.None;
+
+            return ((IAssetStatusCache)this).GetStatusForPath(fullPath);
+        }
+
+        LockStatusData IAssetStatusCache.GetLockStatusDataForPath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return null;
+
+            return mLockStatusCache.GetLockStatusData(path);
+        }
+
+        LockStatusData IAssetStatusCache.GetLockStatusData(string guid)
+        {
+            string fullPath = GetAssetPath(guid);
+
+            return ((IAssetStatusCache)this).GetLockStatusDataForPath(fullPath);
+        }
+
+        void IAssetStatusCache.Clear()
+        {
+            mLocalStatusCache.Clear();
+            mRemoteStatusCache.Clear();
+            mLockStatusCache.Clear();
+        }
+
+        static string GetAssetPath(string guid)
+        {
+            string assetPath = AssetDatabase.GUIDToAssetPath(guid);
+
+            if (string.IsNullOrEmpty(assetPath))
+                return null;
+
+            return Path.GetFullPath(assetPath);
+        }
+
+        readonly LocalStatusCache mLocalStatusCache;
+        readonly RemoteStatusCache mRemoteStatusCache;
+        readonly LockStatusCache mLockStatusCache;
+    }
+}
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/AssetStatusCache.cs.meta b/Editor/PlasticSCM/AssetOverlays/Cache/AssetStatusCache.cs.meta
new file mode 100644
index 0000000..101a000
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/AssetStatusCache.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3f227b28cf424364489edd67fce697bc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/BuildPathDictionary.cs b/Editor/PlasticSCM/AssetOverlays/Cache/BuildPathDictionary.cs
new file mode 100644
index 0000000..b655ac6
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/BuildPathDictionary.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+using Codice.Utils;
+
+namespace Unity.PlasticSCM.Editor.AssetsOverlays.Cache
+{
+    internal static class BuildPathDictionary
+    {
+        internal static Dictionary<string, T> ForPlatform<T>()
+        {
+            if (PlatformIdentifier.IsWindows())
+                return new Dictionary<string, T>(
+                    StringComparer.OrdinalIgnoreCase);
+
+            return new Dictionary<string, T>();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/BuildPathDictionary.cs.meta b/Editor/PlasticSCM/AssetOverlays/Cache/BuildPathDictionary.cs.meta
new file mode 100644
index 0000000..4a3cb1a
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/BuildPathDictionary.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9c963b5d17c74314eb7105e71377cdb8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs b/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs
new file mode 100644
index 0000000..6ec3778
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs
@@ -0,0 +1,83 @@
+using System.Collections.Generic;
+
+using Codice;
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands.WkTree;
+using Codice.Client.Common;
+using Codice.CM.Common;
+
+using PlasticGui;
+using PlasticGui.WorkspaceWindow;
+
+namespace Unity.PlasticSCM.Editor.AssetsOverlays.Cache
+{
+    internal class LocalStatusCache
+    {
+        internal LocalStatusCache(WorkspaceInfo wkInfo)
+        {
+            mWkInfo = wkInfo;
+        }
+
+        internal AssetStatus GetStatus(string fullPath)
+        {
+            AssetStatus result;
+
+            if (mStatusByPathCache.TryGetValue(fullPath, out result))
+                return result;
+
+            result = CalculateStatus(
+                fullPath,
+                mWkInfo.ClientPath,
+                FilterManager.Get().GetIgnoredFilter());
+
+            mStatusByPathCache.Add(fullPath, result);
+
+            return result;
+        }
+
+        internal void Clear()
+        {
+            FilterManager.Get().Reload();
+
+            mStatusByPathCache.Clear();
+        }
+
+        static AssetStatus CalculateStatus(
+            string fullPath,
+            string wkPath,
+            IgnoredFilesFilter ignoredFilter)
+        {
+            if (!IsOnWorkspace(fullPath, wkPath))
+                return AssetStatus.None;
+
+            WorkspaceTreeNode treeNode = Plastic.API.GetWorkspaceTreeNode(fullPath);
+
+            if (CheckWorkspaceTreeNodeStatus.IsPrivate(treeNode))
+            {
+                return ignoredFilter.IsIgnored(fullPath) ?
+                    AssetStatus.Ignored : AssetStatus.Private;
+            }
+
+            if (CheckWorkspaceTreeNodeStatus.IsAdded(treeNode))
+                return AssetStatus.Added;
+
+            AssetStatus result = AssetStatus.Controlled;
+
+            if (CheckWorkspaceTreeNodeStatus.IsCheckedOut(treeNode) &&
+                !CheckWorkspaceTreeNodeStatus.IsDirectory(treeNode))
+                result |= AssetStatus.Checkout;
+
+            return result;
+        }
+
+        static bool IsOnWorkspace(string fullPath, string clientPath)
+        {
+            return PathHelper.IsContainedOn(fullPath, clientPath);
+        }
+
+        Dictionary<string, AssetStatus> mStatusByPathCache =
+            BuildPathDictionary.ForPlatform<AssetStatus>();
+
+        readonly WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs.meta b/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs.meta
new file mode 100644
index 0000000..a52983f
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/LocalStatusCache.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 226459a134855504d841db6b61519d2b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/LockStatusCache.cs b/Editor/PlasticSCM/AssetOverlays/Cache/LockStatusCache.cs
new file mode 100644
index 0000000..e68d46f
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/LockStatusCache.cs
@@ -0,0 +1,220 @@
+using System;
+using System.Collections.Generic;
+
+using Codice;
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands.WkTree;
+using Codice.Client.Common;
+using Codice.Client.Common.Locks;
+using Codice.Client.Common.Threading;
+using Codice.Client.Common.WkTree;
+using Codice.CM.Common;
+using Codice.Utils;
+
+namespace Unity.PlasticSCM.Editor.AssetsOverlays.Cache
+{
+    internal class LockStatusCache
+    {
+        internal LockStatusCache(
+            WorkspaceInfo wkInfo,
+            Action repaintProjectWindow)
+        {
+            mWkInfo = wkInfo;
+            mRepaintProjectWindow = repaintProjectWindow;
+        }
+
+        internal AssetStatus GetStatus(string fullPath)
+        {
+            LockStatusData lockStatusData = GetLockStatusData(fullPath);
+
+            if (lockStatusData == null)
+                return AssetStatus.None;
+
+            return lockStatusData.Status;
+        }
+
+        internal LockStatusData GetLockStatusData(string fullPath)
+        {
+            lock (mLock)
+            {
+                if (mStatusByPathCache == null)
+                {
+                    mStatusByPathCache = BuildPathDictionary.ForPlatform<LockStatusData>();
+
+                    mCurrentCancelToken.Cancel();
+                    mCurrentCancelToken = new CancelToken();
+                    AsyncCalculateStatus(mCurrentCancelToken);
+
+                    return null;
+                }
+
+                LockStatusData result;
+
+                if (mStatusByPathCache.TryGetValue(fullPath, out result))
+                    return result;
+
+                return null;
+            }
+        }
+
+        internal void Clear()
+        {
+            lock (mLock)
+            {
+                mCurrentCancelToken.Cancel();
+
+                mStatusByPathCache = null;
+            }
+        }
+
+        void AsyncCalculateStatus(CancelToken cancelToken)
+        {
+            Dictionary<string, LockStatusData> statusByPathCache = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(50);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+
+                    Dictionary<RepositorySpec, List<WorkspaceTreeNode>> lockCandidates =
+                        new Dictionary<RepositorySpec, List<WorkspaceTreeNode>>();
+
+                    FillLockCandidates.ForTree(mWkInfo, lockCandidates);
+
+                    if (cancelToken.IsCancelled())
+                        return;
+
+                    Dictionary<WorkspaceTreeNode, LockInfo> lockInfoByNode =
+                        SearchLocks.GetLocksInfo(mWkInfo, lockCandidates);
+
+                    if (cancelToken.IsCancelled())
+                        return;
+
+                    statusByPathCache = BuildStatusByNodeCache.
+                        ForLocks(mWkInfo.ClientPath, lockInfoByNode);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.LogException(
+                            "LockStatusCache",
+                            waiter.Exception);
+                        return;
+                    }
+
+                    if (cancelToken.IsCancelled())
+                        return;
+
+                    lock (mLock)
+                    {
+                        mStatusByPathCache = statusByPathCache;
+                    }
+
+                    mRepaintProjectWindow();
+                });
+        }
+
+        static class FillLockCandidates
+        {
+            internal static void ForTree(
+                WorkspaceInfo wkInfo,
+                Dictionary<RepositorySpec, List<WorkspaceTreeNode>> lockCandidates)
+            {
+                WorkspaceTreeNode rootNode = CmConnection.Get().GetWorkspaceTreeHandler().
+                GetWorkspaceTree(wkInfo, wkInfo.ClientPath, true);
+
+                Queue<WorkspaceTreeNode> pendingDirectories = new Queue<WorkspaceTreeNode>();
+                pendingDirectories.Enqueue(rootNode);
+
+                while (pendingDirectories.Count > 0)
+                {
+                    WorkspaceTreeNode directoryNode = pendingDirectories.Dequeue();
+
+                    ForChildren(directoryNode, pendingDirectories, lockCandidates);
+                }
+            }
+
+            static void ForChildren(
+                WorkspaceTreeNode directoryNode,
+                Queue<WorkspaceTreeNode> pendingDirectories,
+                Dictionary<RepositorySpec, List<WorkspaceTreeNode>> lockCandidates)
+            {
+                if (!directoryNode.HasChildren)
+                    return;
+
+                foreach (WorkspaceTreeNode child in directoryNode.Children)
+                {
+                    if (CheckWorkspaceTreeNodeStatus.IsDirectory(child))
+                    {
+                        pendingDirectories.Enqueue(child);
+                        continue;
+                    }
+
+                    if (CheckWorkspaceTreeNodeStatus.IsAdded(child))
+                        continue;
+
+                    List<WorkspaceTreeNode> nodes = null;
+                    if (!lockCandidates.TryGetValue(child.RepSpec, out nodes))
+                    {
+                        nodes = new List<WorkspaceTreeNode>();
+                        lockCandidates.Add(child.RepSpec, nodes);
+                    }
+
+                    nodes.Add(child);
+                }
+            }
+        }
+
+        static class BuildStatusByNodeCache
+        {
+            internal static Dictionary<string, LockStatusData> ForLocks(
+                string wkPath,
+                Dictionary<WorkspaceTreeNode, LockInfo> lockInfoByNode)
+            {
+                Dictionary<string, LockStatusData> result =
+                    BuildPathDictionary.ForPlatform<LockStatusData>();
+
+                LockOwnerNameResolver nameResolver = new LockOwnerNameResolver();
+
+                foreach (WorkspaceTreeNode node in lockInfoByNode.Keys)
+                {
+                    LockStatusData lockStatusData = BuildLockStatusData(
+                       node, lockInfoByNode[node], nameResolver);
+
+                    string nodeWkPath = WorkspacePath.GetWorkspacePathFromCmPath(
+                        wkPath,
+                        WorkspaceNodeOperations.GetCmPath(node),
+                        PathHelper.GetDirectorySeparatorChar(wkPath));
+
+                    result.Add(nodeWkPath, lockStatusData);
+                }
+
+                return result;
+            }
+
+            static LockStatusData BuildLockStatusData(
+                WorkspaceTreeNode node,
+                LockInfo lockInfo,
+                LockOwnerNameResolver nameResolver)
+            {
+                AssetStatus status = CheckWorkspaceTreeNodeStatus.IsCheckedOut(node) ?
+                    AssetStatus.Locked : AssetStatus.LockedRemote;
+
+                return new LockStatusData(
+                    status,
+                    nameResolver.GetSeidName(lockInfo.SEIDData),
+                    LockWkInfo.GetWkCleanName(lockInfo));
+            }
+        }
+
+        CancelToken mCurrentCancelToken = new CancelToken();
+
+        Dictionary<string, LockStatusData> mStatusByPathCache;
+
+        readonly WorkspaceInfo mWkInfo;
+        readonly Action mRepaintProjectWindow;
+
+        static object mLock = new object();
+    }
+}
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/LockStatusCache.cs.meta b/Editor/PlasticSCM/AssetOverlays/Cache/LockStatusCache.cs.meta
new file mode 100644
index 0000000..d3ccadd
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/LockStatusCache.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 953c29d2e0dece647a64940343c91547
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/RemoteStatusCache.cs b/Editor/PlasticSCM/AssetOverlays/Cache/RemoteStatusCache.cs
new file mode 100644
index 0000000..5e198be
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/RemoteStatusCache.cs
@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using Codice.Client.Common;
+using Codice.Client.Common.Threading;
+using Codice.Client.GameUI;
+using Codice.Client.GameUI.Update;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using Codice.Utils;
+using GluonGui.WorkspaceWindow.Views;
+
+namespace Unity.PlasticSCM.Editor.AssetsOverlays.Cache
+{
+    internal class RemoteStatusCache
+    {
+        internal RemoteStatusCache(
+            WorkspaceInfo wkInfo,
+            bool isGluonMode,
+            Action repaintProjectWindow)
+        {
+            mWkInfo = wkInfo;
+            mIsGluonMode = isGluonMode;
+            mRepaintProjectWindow = repaintProjectWindow;
+        }
+
+        internal AssetStatus GetStatus(string fullPath)
+        {
+            if (!mIsGluonMode)
+                return AssetStatus.UpToDate;
+
+            lock(mLock)
+            {
+                if (mStatusByPathCache == null)
+                {
+                    mStatusByPathCache = BuildPathDictionary.ForPlatform<AssetStatus>();
+
+                    mCurrentCancelToken.Cancel();
+                    mCurrentCancelToken = new CancelToken();
+                    AsyncCalculateStatus(mCurrentCancelToken);
+
+                    return AssetStatus.UpToDate;
+                }
+
+                AssetStatus result;
+                if (mStatusByPathCache.TryGetValue(fullPath, out result))
+                    return result;
+
+                return AssetStatus.UpToDate;
+            }
+        }
+
+        internal void Clear()
+        {
+            lock (mLock)
+            {
+                mCurrentCancelToken.Cancel();
+                mStatusByPathCache = null;
+            }
+        }
+
+        void AsyncCalculateStatus(CancelToken cancelToken)
+        {
+            Dictionary<string, AssetStatus> statusByPathCache = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(50);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    OutOfDateItems outOfDateItems =
+                        OutOfDateUpdater.CalculateOutOfDateItems(
+                            mWkInfo, new List<ErrorMessage>(),
+                            OutOfDateCalculator.Options.IsIncomingChanges);
+
+                    if (cancelToken.IsCancelled())
+                        return;
+
+                    statusByPathCache = BuildStatusByPathCache.
+                        ForOutOfDateItems(outOfDateItems, mWkInfo.ClientPath);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.LogException(
+                            "RemoteStatusCache",
+                            waiter.Exception);
+                        return;
+                    }
+
+                    if (cancelToken.IsCancelled())
+                        return;
+
+                    lock (mLock)
+                    {
+                        mStatusByPathCache = statusByPathCache;
+                    }
+
+                    mRepaintProjectWindow();
+                });
+        }
+
+        static class BuildStatusByPathCache
+        {
+            internal static Dictionary<string, AssetStatus> ForOutOfDateItems(
+                OutOfDateItems outOfDateItems,
+                string wkPath)
+            {
+                Dictionary<string, AssetStatus> result =
+                    BuildPathDictionary.ForPlatform<AssetStatus>();
+
+                if (outOfDateItems == null)
+                    return result;
+
+                foreach (OutOfDateItemsByMount diffs in
+                    outOfDateItems.GetOutOfDateItemsByMountList())
+                {
+                    foreach (Difference diff in diffs.Changed)
+                    {
+                        if (diff is DiffXlinkChanged)
+                            continue;
+
+                        string path = GetPathForDiff(wkPath, diffs.Mount, diff.Path);
+                        result.Add(path, AssetStatus.OutOfDate);
+                    }
+
+                    foreach (Difference diff in diffs.Deleted)
+                    {
+                        string path = GetPathForDiff(wkPath, diffs.Mount, diff.Path);
+                        result.Add(path, AssetStatus.DeletedOnServer);
+                    }
+                }
+
+                foreach (GluonFileConflict fileConflict in
+                    outOfDateItems.GetFileConflicts())
+                {
+                    string path = GetPathForConflict(wkPath, fileConflict.CmPath);
+                    result.Add(path, AssetStatus.Conflicted);
+                }
+
+                return result;
+            }
+
+            static string GetPathForDiff(
+                string wkPath,
+                MountPointWithPath mountPoint,
+                string cmSubPath)
+            {
+                return WorkspacePath.GetWorkspacePathFromCmPath(
+                    wkPath,
+                    WorkspacePath.ComposeMountPath(mountPoint.MountPath, cmSubPath),
+                    PathHelper.GetDirectorySeparatorChar(wkPath));
+            }
+
+            static string GetPathForConflict(
+                string wkPath,
+                string cmPath)
+            {
+                return WorkspacePath.GetWorkspacePathFromCmPath(
+                    wkPath, cmPath,
+                    PathHelper.GetDirectorySeparatorChar(wkPath));
+            }
+        }
+
+        CancelToken mCurrentCancelToken = new CancelToken();
+
+        Dictionary<string, AssetStatus> mStatusByPathCache;
+
+        readonly Action mRepaintProjectWindow;
+        readonly bool mIsGluonMode;
+        readonly WorkspaceInfo mWkInfo;
+
+        static object mLock = new object();
+    }
+}
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/RemoteStatusCache.cs.meta b/Editor/PlasticSCM/AssetOverlays/Cache/RemoteStatusCache.cs.meta
new file mode 100644
index 0000000..cb8963e
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/RemoteStatusCache.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a9acb575a60d7e045ad7fadd3e3e137d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/SearchLocks.cs b/Editor/PlasticSCM/AssetOverlays/Cache/SearchLocks.cs
new file mode 100644
index 0000000..4eb2b42
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/SearchLocks.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+
+using Codice.Client.Commands.WkTree;
+using Codice.Client.Common;
+using Codice.Client.Common.Locks;
+using Codice.Client.Common.WkTree;
+using Codice.CM.Common;
+using Codice.CM.WorkspaceServer.DataStore.Guids;
+
+namespace Unity.PlasticSCM.Editor.AssetsOverlays.Cache
+{
+    internal static class SearchLocks
+    {
+        internal static Dictionary<WorkspaceTreeNode, LockInfo> GetLocksInfo(
+            WorkspaceInfo wkInfo,
+            Dictionary<RepositorySpec, List<WorkspaceTreeNode>> locksCandidates)
+        {
+            Dictionary<WorkspaceTreeNode, LockInfo> result =
+                new Dictionary<WorkspaceTreeNode, LockInfo>();
+
+            Dictionary<string, Dictionary<Guid, LockInfo>> locksByItemByServer =
+                new Dictionary<string, Dictionary<Guid, LockInfo>>(
+                    StringComparer.InvariantCultureIgnoreCase);
+
+            foreach (KeyValuePair<RepositorySpec, List<WorkspaceTreeNode>> each in locksCandidates)
+            {
+                FillRepositoryLocks(
+                    wkInfo, each.Key, each.Value,
+                    locksByItemByServer, result);
+            }
+
+            return result;
+        }
+
+        static void FillRepositoryLocks(
+            WorkspaceInfo wkInfo,
+            RepositorySpec repSpec,
+            List<WorkspaceTreeNode> candidates,
+            Dictionary<string, Dictionary<Guid, LockInfo>> locksByItemByServer,
+            Dictionary<WorkspaceTreeNode, LockInfo> locks)
+        {
+            if (candidates.Count == 0)
+                return;
+
+            LockRule lockRule = ServerLocks.GetLockRule(repSpec);
+
+            if (lockRule == null)
+                return;
+
+            candidates = GetLockableCandidates(candidates, lockRule);
+
+            if (candidates.Count == 0)
+                return;
+
+            string lockServer = string.IsNullOrEmpty(lockRule.LockServer) ?
+                repSpec.Server : lockRule.LockServer;
+
+            Dictionary<Guid, LockInfo> serverlocksByItem =
+                ServerLocks.GetServerLocksByItem(
+                    lockServer, locksByItemByServer);
+
+            if (serverlocksByItem == null || serverlocksByItem.Count == 0)
+                return;
+
+            IList<Guid> candidatesGuids = GetCandidatesGuids(
+                wkInfo, repSpec, candidates);
+
+            for (int index = 0; index < candidates.Count; index++)
+            {
+                LockInfo serverLock;
+                if (!serverlocksByItem.TryGetValue(
+                        candidatesGuids[index], out serverLock))
+                    continue;
+
+                locks[candidates[index]] = serverLock;
+            }
+        }
+
+        static List<WorkspaceTreeNode> GetLockableCandidates(
+            List<WorkspaceTreeNode> candidates,
+            LockRule lockRule)
+        {
+            List<WorkspaceTreeNode> result = new List<WorkspaceTreeNode>();
+
+            LockedFilesFilter filter = new LockedFilesFilter(lockRule.Rules);
+
+            foreach (WorkspaceTreeNode candidate in candidates)
+            {
+                string cmPath = WorkspaceNodeOperations.GetCmPath(candidate);
+
+                if (cmPath == null)
+                {
+                    //The node could not be on the head tree (like copied items) so when we
+                    //cannot calculate the path we assume that it's lockable.
+                    result.Add(candidate);
+                    continue;
+                }
+
+                if (filter.IsLockable(cmPath))
+                    result.Add(candidate);
+            }
+
+            return result;
+        }
+
+        static IList<Guid> GetCandidatesGuids(
+            WorkspaceInfo wkInfo,
+            RepositorySpec repSpec,
+            List<WorkspaceTreeNode> candidates)
+        {
+            RepositoryInfo repInfo = RepositorySpecResolverProvider.
+                Get().GetRepInfo(repSpec);
+
+            IList<long> ids = new List<long>(candidates.Count);
+
+            foreach (WorkspaceTreeNode candidate in candidates)
+                ids.Add(candidate.RevInfo.ItemId);
+
+            return GuidResolver.Get().GetObjectGuids(repInfo, wkInfo, ids);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetOverlays/Cache/SearchLocks.cs.meta b/Editor/PlasticSCM/AssetOverlays/Cache/SearchLocks.cs.meta
new file mode 100644
index 0000000..5b37b16
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/Cache/SearchLocks.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cef27b0c65987be4384e16c988465aca
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetOverlays/DrawAssetOverlay.cs b/Editor/PlasticSCM/AssetOverlays/DrawAssetOverlay.cs
new file mode 100644
index 0000000..0e5379c
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/DrawAssetOverlay.cs
@@ -0,0 +1,324 @@
+using System;
+
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.AssetsOverlays
+{
+    internal static class DrawAssetOverlay
+    {
+        internal static void Initialize(
+            IAssetStatusCache cache,
+            Action repaintProjectWindow)
+        {
+            mAssetStatusCache = cache;
+            mRepaintProjectWindow = repaintProjectWindow;
+
+            EditorApplication.projectWindowItemOnGUI += OnProjectWindowItemGUI;
+
+            mRepaintProjectWindow();
+        }
+
+        internal static void Dispose()
+        {
+            EditorApplication.projectWindowItemOnGUI -= OnProjectWindowItemGUI;
+
+            if (mRepaintProjectWindow != null)
+                mRepaintProjectWindow();
+        }
+
+        internal static void ClearCache()
+        {
+            mAssetStatusCache.Clear();
+            mRepaintProjectWindow();
+        }
+
+        internal static AssetStatus GetStatusesToDraw(AssetStatus status)
+        {
+            if (status.HasFlag(AssetStatus.Checkout) &&
+                status.HasFlag(AssetStatus.Locked))
+                return status & ~AssetStatus.Checkout;
+
+            if (status.HasFlag(AssetStatus.DeletedOnServer) &&
+                status.HasFlag(AssetStatus.LockedRemote))
+                return status & ~AssetStatus.LockedRemote;
+
+            return status;
+        }
+
+        internal static string GetStatusString(AssetStatus statusValue)
+        {
+            switch (statusValue)
+            {
+                case AssetStatus.Private:
+                    return PlasticLocalization.GetString(
+                        PlasticLocalization.Name.Private);
+                case AssetStatus.Ignored:
+                    return PlasticLocalization.GetString(
+                        PlasticLocalization.Name.StatusIgnored);
+                case AssetStatus.Added:
+                    return PlasticLocalization.GetString(
+                        PlasticLocalization.Name.StatusAdded);
+                case AssetStatus.Checkout:
+                    return PlasticLocalization.GetString(
+                        PlasticLocalization.Name.StatusCheckout);
+                case AssetStatus.OutOfDate:
+                    return PlasticLocalization.GetString(
+                        PlasticLocalization.Name.StatusOutOfDate);
+                case AssetStatus.Conflicted:
+                    return PlasticLocalization.GetString(
+                        PlasticLocalization.Name.StatusConflicted);
+                case AssetStatus.DeletedOnServer:
+                    return PlasticLocalization.GetString(
+                        PlasticLocalization.Name.StatusDeletedOnServer);
+                case AssetStatus.Locked:
+                    return PlasticLocalization.GetString(
+                        PlasticLocalization.Name.StatusLockedMe);
+                case AssetStatus.LockedRemote:
+                    return PlasticLocalization.GetString(
+                        PlasticLocalization.Name.StatusLockedRemote);
+            }
+
+            return string.Empty;
+        }
+
+        internal static string GetTooltipText(
+            AssetStatus statusValue,
+            LockStatusData lockStatusData)
+        {
+            string statusText = GetStatusString(statusValue);
+
+            if (lockStatusData == null)
+                return statusText;
+
+            // example:
+            // Changed by:
+            // * dani_pen@hotmail.com
+            // * workspace wkLocal"
+
+            char bulletCharacter = '\u25cf';
+
+            string line1 = PlasticLocalization.GetString(
+                PlasticLocalization.Name.AssetOverlayTooltipStatus, statusText);
+
+            string line2 = string.Format("{0} {1}",
+                bulletCharacter,
+                lockStatusData.LockedBy);
+
+            string line3 = string.Format("{0} {1}",
+                bulletCharacter,
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.AssetOverlayTooltipWorkspace,
+                    lockStatusData.WorkspaceName));
+
+            return string.Format(
+                "{0}" + Environment.NewLine +
+                "{1}" + Environment.NewLine +
+                "{2}",
+                line1,
+                line2,
+                line3);
+        }
+
+        static void OnProjectWindowItemGUI(string guid, Rect selectionRect)
+        {
+            if (string.IsNullOrEmpty(guid))
+                return;
+
+            if (Event.current.type != EventType.Repaint)
+                return;
+
+            AssetStatus statusesToDraw = GetStatusesToDraw(
+                mAssetStatusCache.GetStatusForGuid(guid));
+
+            foreach (AssetStatus status in Enum.GetValues(typeof(AssetStatus)))
+            {
+                if (status == AssetStatus.None)
+                    continue;
+
+                if (!statusesToDraw.HasFlag(status))
+                    continue;
+
+                LockStatusData lockStatusData =
+                    ClassifyAssetStatus.IsLockedRemote(status) ?
+                        mAssetStatusCache.GetLockStatusData(guid) :
+                        null;
+
+                string tooltipText = GetTooltipText(
+                    status,
+                    lockStatusData);
+
+                DrawOverlayIcon.ForStatus(
+                    selectionRect,
+                    status,
+                    tooltipText);
+            }
+        }
+
+        internal static class DrawOverlayIcon
+        {
+            internal static void ForStatus(
+                Rect selectionRect,
+                AssetStatus status,
+                string tooltipText)
+            {
+                Texture overlayIcon = GetOverlayIcon(status);
+
+                if (overlayIcon == null)
+                    return;
+
+                Rect overlayRect = GetOverlayRect(
+                    selectionRect, overlayIcon, status);
+
+                GUI.DrawTexture(
+                    overlayRect, overlayIcon, ScaleMode.ScaleToFit);
+
+                Rect tooltipRect = GetTooltipRect(selectionRect, overlayRect);
+
+                GUI.Label(tooltipRect, new GUIContent(string.Empty, tooltipText));
+            }
+
+            internal static Texture GetOverlayIcon(AssetStatus status)
+            {
+                switch (status)
+                {
+                    case AssetStatus.Ignored:
+                        return Images.GetImage(Images.Name.Ignored);
+                    case AssetStatus.Private:
+                        return Images.GetPrivatedOverlayIcon();
+                    case AssetStatus.Added:
+                        return Images.GetAddedOverlayIcon();
+                    case AssetStatus.Checkout:
+                        return Images.GetCheckedOutOverlayIcon();
+                    case AssetStatus.OutOfDate:
+                        return Images.GetOutOfSyncOverlayIcon();
+                    case AssetStatus.Conflicted:
+                        return Images.GetConflictedOverlayIcon();
+                    case AssetStatus.DeletedOnServer:
+                        return Images.GetDeletedRemoteOverlayIcon();
+                    case AssetStatus.Locked:
+                        return Images.GetLockedLocalOverlayIcon();
+                    case AssetStatus.LockedRemote:
+                        return Images.GetLockedRemoteOverlayIcon();
+                }
+
+                return null;
+            }
+
+            static Rect Inflate(Rect rect, float width, float height)
+            {
+                return new Rect(
+                    rect.x - width,
+                    rect.y - height,
+                    rect.width + 2 * width,
+                    rect.height + 2 * height);
+            }
+
+            static Rect GetOverlayRect(
+                Rect selectionRect,
+                Texture overlayIcon,
+                AssetStatus status)
+            {
+                OverlayAlignment alignment = GetIconPosition(status);
+
+                if (selectionRect.width > selectionRect.height)
+                    return GetOverlayRectForSmallestSize(
+                        selectionRect, overlayIcon, alignment);
+
+                return GetOverlayRectForOtherSizes(
+                    selectionRect, overlayIcon, alignment);
+            }
+
+            static Rect GetTooltipRect(
+                Rect selectionRect,
+                Rect overlayRect)
+            {
+                if (selectionRect.width > selectionRect.height)
+                {
+                    return overlayRect;
+                }
+
+                return Inflate(overlayRect, 3, 3);
+            }
+
+            static Rect GetOverlayRectForSmallestSize(
+                Rect selectionRect,
+                Texture overlayIcon,
+                OverlayAlignment alignment)
+            {
+                float xOffset = IsLeftAligned(alignment) ? -5 : 5;
+                float yOffset = IsTopAligned(alignment) ? -4 : 4;
+
+                return new Rect(
+                    selectionRect.x + xOffset,
+                    selectionRect.y + yOffset,
+                    OVERLAY_ICON_SIZE,
+                    OVERLAY_ICON_SIZE);
+            }
+
+            static Rect GetOverlayRectForOtherSizes(
+                Rect selectionRect,
+                Texture overlayIcon,
+                OverlayAlignment alignment)
+            {
+                float xOffset = IsLeftAligned(alignment) ?
+                    0 : selectionRect.width - overlayIcon.width;
+
+                float yOffset = IsTopAligned(alignment) ?
+                    0 : selectionRect.height - overlayIcon.height - 12;
+
+                return new Rect(
+                    selectionRect.x + xOffset,
+                    selectionRect.y + yOffset,
+                    OVERLAY_ICON_SIZE,
+                    OVERLAY_ICON_SIZE);
+            }
+
+            static OverlayAlignment GetIconPosition(AssetStatus status)
+            {
+                if (status == AssetStatus.Checkout ||
+                    status == AssetStatus.Locked)
+                    return OverlayAlignment.TopLeft;
+
+                if (status == AssetStatus.DeletedOnServer ||
+                    status == AssetStatus.LockedRemote)
+                    return OverlayAlignment.TopRight;
+
+                if (status == AssetStatus.OutOfDate)
+                    return OverlayAlignment.BottomRight;
+
+                return OverlayAlignment.BottomLeft;
+            }
+
+            static bool IsLeftAligned(OverlayAlignment alignment)
+            {
+                return alignment == OverlayAlignment.BottomLeft ||
+                       alignment == OverlayAlignment.TopLeft;
+            }
+
+            static bool IsTopAligned(OverlayAlignment alignment)
+            {
+                return alignment == OverlayAlignment.TopLeft ||
+                       alignment == OverlayAlignment.TopRight;
+            }
+
+            enum OverlayAlignment
+            {
+                TopLeft,
+                BottomLeft,
+                TopRight,
+                BottomRight
+            }
+        }
+
+        static IAssetStatusCache mAssetStatusCache;
+        static Action mRepaintProjectWindow;
+
+        const float OVERLAY_ICON_SIZE = 16;
+    }
+}
+
diff --git a/Editor/PlasticSCM/AssetOverlays/DrawAssetOverlay.cs.meta b/Editor/PlasticSCM/AssetOverlays/DrawAssetOverlay.cs.meta
new file mode 100644
index 0000000..62389ce
--- /dev/null
+++ b/Editor/PlasticSCM/AssetOverlays/DrawAssetOverlay.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d30dfeb72257204458e1e8e1576b84ba
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets.meta b/Editor/PlasticSCM/Assets.meta
new file mode 100644
index 0000000..2d50bc6
--- /dev/null
+++ b/Editor/PlasticSCM/Assets.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b01e5a3d2517b904698dbc9fa0df727f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images.meta b/Editor/PlasticSCM/Assets/Images.meta
new file mode 100644
index 0000000..63f947f
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8697b23ed1b3db0448e2580433ae07d7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/buttonssosigninemail.png b/Editor/PlasticSCM/Assets/Images/buttonssosigninemail.png
new file mode 100644
index 0000000..8c20609
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/buttonssosigninemail.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/buttonssosigninemail.png.meta b/Editor/PlasticSCM/Assets/Images/buttonssosigninemail.png.meta
new file mode 100644
index 0000000..21d83ba
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/buttonssosigninemail.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: d24e7e0b75e1a244bb9687d6fd4315ef
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/buttonssosigninemail@2x.png b/Editor/PlasticSCM/Assets/Images/buttonssosigninemail@2x.png
new file mode 100644
index 0000000..fae13d7
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/buttonssosigninemail@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/buttonssosigninemail@2x.png.meta b/Editor/PlasticSCM/Assets/Images/buttonssosigninemail@2x.png.meta
new file mode 100644
index 0000000..cd724ec
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/buttonssosigninemail@2x.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: ddf2e76e8a1f88f46ae1e42277850b48
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/buttonssosigningoogle.png b/Editor/PlasticSCM/Assets/Images/buttonssosigningoogle.png
new file mode 100644
index 0000000..89b1c93
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/buttonssosigningoogle.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/buttonssosigningoogle.png.meta b/Editor/PlasticSCM/Assets/Images/buttonssosigningoogle.png.meta
new file mode 100644
index 0000000..9442325
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/buttonssosigningoogle.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f09eae8c0ea04254b90c5386a034a225
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/buttonssosigninunity.png b/Editor/PlasticSCM/Assets/Images/buttonssosigninunity.png
new file mode 100644
index 0000000..177c2e9
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/buttonssosigninunity.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/buttonssosigninunity.png.meta b/Editor/PlasticSCM/Assets/Images/buttonssosigninunity.png.meta
new file mode 100644
index 0000000..57bca22
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/buttonssosigninunity.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f9161c6c9e06dc445ada3ee16d991f90
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail.png b/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail.png
new file mode 100644
index 0000000..7cc1302
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail.png.meta b/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail.png.meta
new file mode 100644
index 0000000..4de2c40
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 3086d66a563317b40a20a20da2c64ac0
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail@2x.png b/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail@2x.png
new file mode 100644
index 0000000..9de0447
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail@2x.png.meta b/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail@2x.png.meta
new file mode 100644
index 0000000..801a4b3
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_buttonssosigninemail@2x.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 144aa74618b85974a9a50f612c2fa8fd
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_cloudbuho.png b/Editor/PlasticSCM/Assets/Images/d_cloudbuho.png
new file mode 100644
index 0000000..1b72409
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_cloudbuho.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_cloudbuho.png.meta b/Editor/PlasticSCM/Assets/Images/d_cloudbuho.png.meta
new file mode 100644
index 0000000..a0934a8
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_cloudbuho.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: e5600378dd761e64d9423790c482bf36
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_cloudbuhochristmas.png b/Editor/PlasticSCM/Assets/Images/d_cloudbuhochristmas.png
new file mode 100644
index 0000000..cd10d4e
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_cloudbuhochristmas.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_cloudbuhochristmas.png.meta b/Editor/PlasticSCM/Assets/Images/d_cloudbuhochristmas.png.meta
new file mode 100644
index 0000000..ef07e8b
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_cloudbuhochristmas.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 70632ddfe8e71b04b8f90ef7e29a9e98
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshe.png b/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshe.png
new file mode 100644
index 0000000..5372b1a
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshe.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshe.png.meta b/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshe.png.meta
new file mode 100644
index 0000000..ecefb30
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshe.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: dae33700bd23f76409a80bf78fdb8a42
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshechristmas.png b/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshechristmas.png
new file mode 100644
index 0000000..48b203a
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshechristmas.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshechristmas.png.meta b/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshechristmas.png.meta
new file mode 100644
index 0000000..c126246
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_cloudbuhoshechristmas.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 9c0d6ec706e01ce448aea81584af092b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_colorbuho.png b/Editor/PlasticSCM/Assets/Images/d_colorbuho.png
new file mode 100644
index 0000000..0a13c12
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_colorbuho.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_colorbuho.png.meta b/Editor/PlasticSCM/Assets/Images/d_colorbuho.png.meta
new file mode 100644
index 0000000..389478b
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_colorbuho.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 3a0c527d7f890d64a9b56b086e6e766a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_colorbuhochristmas.png b/Editor/PlasticSCM/Assets/Images/d_colorbuhochristmas.png
new file mode 100644
index 0000000..90373fe
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_colorbuhochristmas.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_colorbuhochristmas.png.meta b/Editor/PlasticSCM/Assets/Images/d_colorbuhochristmas.png.meta
new file mode 100644
index 0000000..d265b36
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_colorbuhochristmas.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: fd098fb4cf57bad419701c802e442b7e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_colorbuhoshe.png b/Editor/PlasticSCM/Assets/Images/d_colorbuhoshe.png
new file mode 100644
index 0000000..7dc0bd6
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_colorbuhoshe.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_colorbuhoshe.png.meta b/Editor/PlasticSCM/Assets/Images/d_colorbuhoshe.png.meta
new file mode 100644
index 0000000..cf2b355
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_colorbuhoshe.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: a04ecc9d5e12d5d449077414eb86635e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_colorbuhoshechristmas.png b/Editor/PlasticSCM/Assets/Images/d_colorbuhoshechristmas.png
new file mode 100644
index 0000000..7ae102f
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_colorbuhoshechristmas.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_colorbuhoshechristmas.png.meta b/Editor/PlasticSCM/Assets/Images/d_colorbuhoshechristmas.png.meta
new file mode 100644
index 0000000..e88e354
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_colorbuhoshechristmas.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: ec03f79379868c642b48ae5ddc821b6d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_expertbuho.png b/Editor/PlasticSCM/Assets/Images/d_expertbuho.png
new file mode 100644
index 0000000..fbd9ed1
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_expertbuho.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_expertbuho.png.meta b/Editor/PlasticSCM/Assets/Images/d_expertbuho.png.meta
new file mode 100644
index 0000000..9922116
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_expertbuho.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 13e7e6fe43a8aa049bcd610bbc1f5ff8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_expertbuhochristmas.png b/Editor/PlasticSCM/Assets/Images/d_expertbuhochristmas.png
new file mode 100644
index 0000000..2d70cae
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_expertbuhochristmas.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_expertbuhochristmas.png.meta b/Editor/PlasticSCM/Assets/Images/d_expertbuhochristmas.png.meta
new file mode 100644
index 0000000..ac582b9
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_expertbuhochristmas.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: c887ed2a931c29040bc544cd8c546e9f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_expertbuhoshe.png b/Editor/PlasticSCM/Assets/Images/d_expertbuhoshe.png
new file mode 100644
index 0000000..238c989
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_expertbuhoshe.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_expertbuhoshe.png.meta b/Editor/PlasticSCM/Assets/Images/d_expertbuhoshe.png.meta
new file mode 100644
index 0000000..808da19
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_expertbuhoshe.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 8325d4ef0a6eb3d43952aff8a06d9f45
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_expertbuhoshechristmas.png b/Editor/PlasticSCM/Assets/Images/d_expertbuhoshechristmas.png
new file mode 100644
index 0000000..388be82
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_expertbuhoshechristmas.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_expertbuhoshechristmas.png.meta b/Editor/PlasticSCM/Assets/Images/d_expertbuhoshechristmas.png.meta
new file mode 100644
index 0000000..3a47a19
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_expertbuhoshechristmas.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 372e7b39fc8f34549ac25d8757965a2c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuho1.png b/Editor/PlasticSCM/Assets/Images/d_genericbuho1.png
new file mode 100644
index 0000000..536b489
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuho1.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuho1.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuho1.png.meta
new file mode 100644
index 0000000..890ff08
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuho1.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 43ad51e043491b94d8f6c62d55ac5ede
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuho2.png b/Editor/PlasticSCM/Assets/Images/d_genericbuho2.png
new file mode 100644
index 0000000..bb4112f
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuho2.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuho2.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuho2.png.meta
new file mode 100644
index 0000000..8b8267a
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuho2.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 0f061b4bd0275bc4eb60f2af31e7375a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuho3.png b/Editor/PlasticSCM/Assets/Images/d_genericbuho3.png
new file mode 100644
index 0000000..79aee06
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuho3.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuho3.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuho3.png.meta
new file mode 100644
index 0000000..9a2c66a
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuho3.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 9e9474494461bd048803b48e391ef0f6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas1.png b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas1.png
new file mode 100644
index 0000000..1da2f54
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas1.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas1.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas1.png.meta
new file mode 100644
index 0000000..4daefb8
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas1.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: e36d1a38d7aa309409e80bf66a089330
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas2.png b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas2.png
new file mode 100644
index 0000000..3504b69
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas2.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas2.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas2.png.meta
new file mode 100644
index 0000000..36fa99d
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas2.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 5955491dc8dcecb4a993d9a008cf65a7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas3.png b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas3.png
new file mode 100644
index 0000000..39fb85e
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas3.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas3.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas3.png.meta
new file mode 100644
index 0000000..526452e
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuhochristmas3.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 6fac4e39926fd9c4ca2ba4416160a857
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe1.png b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe1.png
new file mode 100644
index 0000000..957cc5b
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe1.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe1.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe1.png.meta
new file mode 100644
index 0000000..d3f250e
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe1.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f2901efd8bb16bc408ad37f017fbf9bc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe2.png b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe2.png
new file mode 100644
index 0000000..b300dcf
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe2.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe2.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe2.png.meta
new file mode 100644
index 0000000..6692790
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe2.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 17035c204825f6340a252046ab6476fd
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe3.png b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe3.png
new file mode 100644
index 0000000..80129eb
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe3.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe3.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe3.png.meta
new file mode 100644
index 0000000..be25e86
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshe3.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 9bb60d9b0987c3747b57516cc172d0c7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas1.png b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas1.png
new file mode 100644
index 0000000..e585f16
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas1.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas1.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas1.png.meta
new file mode 100644
index 0000000..7b8e7d3
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas1.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: d98fbe17966d8ef449b25b99024bf36f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas2.png b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas2.png
new file mode 100644
index 0000000..7eb560e
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas2.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas2.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas2.png.meta
new file mode 100644
index 0000000..4716ca6
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas2.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 7fd3cda14282bb7429b8eeb6c121e5bb
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas3.png b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas3.png
new file mode 100644
index 0000000..d4c4eb6
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas3.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas3.png.meta b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas3.png.meta
new file mode 100644
index 0000000..0858f74
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_genericbuhoshechristmas3.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f8c9467a892580344bb697526dac0d13
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_iconplasticview.png b/Editor/PlasticSCM/Assets/Images/d_iconplasticview.png
new file mode 100644
index 0000000..1a8a4e9
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_iconplasticview.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_iconplasticview.png.meta b/Editor/PlasticSCM/Assets/Images/d_iconplasticview.png.meta
new file mode 100644
index 0000000..43290c8
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_iconplasticview.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 519d97e745e55f041b609f3666cbc037
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: f8e3a80d377cb5148bddca0d49e2ed54
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_iconplasticview@2x.png b/Editor/PlasticSCM/Assets/Images/d_iconplasticview@2x.png
new file mode 100644
index 0000000..856034a
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_iconplasticview@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_iconplasticview@2x.png.meta b/Editor/PlasticSCM/Assets/Images/d_iconplasticview@2x.png.meta
new file mode 100644
index 0000000..a6126d0
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_iconplasticview@2x.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 3168140d6f409d0448447f18568d9482
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: c3a3cc66c2dec5c42827c966aaba2c6c
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_loading.png b/Editor/PlasticSCM/Assets/Images/d_loading.png
new file mode 100644
index 0000000..a38ff00
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_loading.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_loading.png.meta b/Editor/PlasticSCM/Assets/Images/d_loading.png.meta
new file mode 100644
index 0000000..d2b53d1
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_loading.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: d58e94bfb1bac774dbb8ca9c2597ef2e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_loading@2x.png b/Editor/PlasticSCM/Assets/Images/d_loading@2x.png
new file mode 100644
index 0000000..dec1779
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_loading@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_loading@2x.png.meta b/Editor/PlasticSCM/Assets/Images/d_loading@2x.png.meta
new file mode 100644
index 0000000..eee2b4e
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_loading@2x.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 7ee48c5fba4919649a8a6094cbead669
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_step1.png b/Editor/PlasticSCM/Assets/Images/d_step1.png
new file mode 100644
index 0000000..412edd6
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_step1.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_step1.png.meta b/Editor/PlasticSCM/Assets/Images/d_step1.png.meta
new file mode 100644
index 0000000..1781dcb
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_step1.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 38236a82ff44aaa4b972248479d5f970
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5c7c8d8922b532249b982e4c0365d653
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_step1@2x.png b/Editor/PlasticSCM/Assets/Images/d_step1@2x.png
new file mode 100644
index 0000000..b5d623b
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_step1@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_step1@2x.png.meta b/Editor/PlasticSCM/Assets/Images/d_step1@2x.png.meta
new file mode 100644
index 0000000..ec4fb78
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_step1@2x.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: c8a69ecdf54ac8e4b873466605de27ff
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: dbad3d69da696d44da71467b14affbec
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_step2.png b/Editor/PlasticSCM/Assets/Images/d_step2.png
new file mode 100644
index 0000000..4776eb1
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_step2.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_step2.png.meta b/Editor/PlasticSCM/Assets/Images/d_step2.png.meta
new file mode 100644
index 0000000..c0af8aa
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_step2.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 897c3a3f5c4038345a7143573bbb4a40
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: a39662d1ab72e624fa6636e50f298916
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_step2@2x.png b/Editor/PlasticSCM/Assets/Images/d_step2@2x.png
new file mode 100644
index 0000000..5aab9e4
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_step2@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_step2@2x.png.meta b/Editor/PlasticSCM/Assets/Images/d_step2@2x.png.meta
new file mode 100644
index 0000000..0ce204f
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_step2@2x.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: cdb88fdb0cf46b244a667edaff21c7df
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: cae3485a947b3ad41ab4e005cebf5fc7
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_step3.png b/Editor/PlasticSCM/Assets/Images/d_step3.png
new file mode 100644
index 0000000..3b0741c
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_step3.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_step3.png.meta b/Editor/PlasticSCM/Assets/Images/d_step3.png.meta
new file mode 100644
index 0000000..3a5df56
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_step3.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 46930b20180b59e46b73494adf53abbb
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 1cf775c54c8394c47a53536f1e461c1a
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_step3@2x.png b/Editor/PlasticSCM/Assets/Images/d_step3@2x.png
new file mode 100644
index 0000000..cfd244a
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_step3@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_step3@2x.png.meta b/Editor/PlasticSCM/Assets/Images/d_step3@2x.png.meta
new file mode 100644
index 0000000..07a4441
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_step3@2x.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: c9ed6d6ea2f9657409bfa068d4846139
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 468c37b67528e174ab69506f5c140403
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_stepok.png b/Editor/PlasticSCM/Assets/Images/d_stepok.png
new file mode 100644
index 0000000..c7b5d83
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_stepok.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_stepok.png.meta b/Editor/PlasticSCM/Assets/Images/d_stepok.png.meta
new file mode 100644
index 0000000..62d3674
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_stepok.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: be423a54b981d38428de82ad12534629
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 8ec904eb4adfda84d9669b386557c8ff
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_stepok@2x.png b/Editor/PlasticSCM/Assets/Images/d_stepok@2x.png
new file mode 100644
index 0000000..6172eb0
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_stepok@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_stepok@2x.png.meta b/Editor/PlasticSCM/Assets/Images/d_stepok@2x.png.meta
new file mode 100644
index 0000000..025a884
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_stepok@2x.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 3494dc956dfd7174abc07060940a2848
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 914a29fa17201064fb558eba2fdc6047
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_stevejobsbuho.png b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuho.png
new file mode 100644
index 0000000..5e1ab3b
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuho.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_stevejobsbuho.png.meta b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuho.png.meta
new file mode 100644
index 0000000..3b7ef44
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuho.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: e92527f6d0fe45342ab542b47346d45f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhochristmas.png b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhochristmas.png
new file mode 100644
index 0000000..4ae160f
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhochristmas.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhochristmas.png.meta b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhochristmas.png.meta
new file mode 100644
index 0000000..5b410fd
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhochristmas.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 08c91a7677e66844281a99aaf6ea36f1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshe.png b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshe.png
new file mode 100644
index 0000000..67a0472
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshe.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshe.png.meta b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshe.png.meta
new file mode 100644
index 0000000..157e04f
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshe.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 56e456ab0f7f79a4dbabcc9079c49a94
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshechristmas.png b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshechristmas.png
new file mode 100644
index 0000000..3ec78e9
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshechristmas.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshechristmas.png.meta b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshechristmas.png.meta
new file mode 100644
index 0000000..54c778c
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/d_stevejobsbuhoshechristmas.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f008857e434b98b4eaabda1fd6af3059
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconadded.png b/Editor/PlasticSCM/Assets/Images/iconadded.png
new file mode 100644
index 0000000..9a850c3
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconadded.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconadded.png.meta b/Editor/PlasticSCM/Assets/Images/iconadded.png.meta
new file mode 100644
index 0000000..bdcff37
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconadded.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 1196e728cbc6c25429f25431acabb4d1
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 62eeea909492fd146aa1cf9930f6015e
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconchanged.png b/Editor/PlasticSCM/Assets/Images/iconchanged.png
new file mode 100644
index 0000000..04d5931
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconchanged.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconchanged.png.meta b/Editor/PlasticSCM/Assets/Images/iconchanged.png.meta
new file mode 100644
index 0000000..1b19b98
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconchanged.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 6719b9ff26333564181b5328d934035c
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 82b4f26d56661e34cb65ee2b58d2a19b
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconclosebutton.png b/Editor/PlasticSCM/Assets/Images/iconclosebutton.png
new file mode 100644
index 0000000..bec9a7e
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconclosebutton.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconclosebutton.png.meta b/Editor/PlasticSCM/Assets/Images/iconclosebutton.png.meta
new file mode 100644
index 0000000..ba0b4b3
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconclosebutton.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 13527793884104b46b7446fd7464c3ed
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 82c6d4c8cabb9d04f9eaf4ca9fe33bf0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/icondeleted.png b/Editor/PlasticSCM/Assets/Images/icondeleted.png
new file mode 100644
index 0000000..a5d32f5
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/icondeleted.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/icondeleted.png.meta b/Editor/PlasticSCM/Assets/Images/icondeleted.png.meta
new file mode 100644
index 0000000..ac6bc39
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/icondeleted.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 77a39e873655d3c4b93d0b7696397b83
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 00077e01d1a00d94c9c06cca9b22804e
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png b/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png
new file mode 100644
index 0000000..16a9cdd
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png.meta b/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png.meta
new file mode 100644
index 0000000..0008f45
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconemptygravatar.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: fc4618fe47c3a4a4395e0fa7a839921b
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 6f28ba836400c51469696c80e37bb1da
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png b/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png
new file mode 100644
index 0000000..05d66ee
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png.meta b/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png.meta
new file mode 100644
index 0000000..399be18
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconemptygravatar@2x.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: a553409d46d2f0341a53411e40d9a9a2
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: da68f72147085ca478254e1681a0e8bc
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconfschanged.png b/Editor/PlasticSCM/Assets/Images/iconfschanged.png
new file mode 100644
index 0000000..da39bf8
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconfschanged.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconfschanged.png.meta b/Editor/PlasticSCM/Assets/Images/iconfschanged.png.meta
new file mode 100644
index 0000000..1225209
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconfschanged.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 42d45b97073618b42bfcfc22740c4bc7
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 635248474b4706d418fb9683f94433e9
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconmergecategory.png b/Editor/PlasticSCM/Assets/Images/iconmergecategory.png
new file mode 100644
index 0000000..5459289
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconmergecategory.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconmergecategory.png.meta b/Editor/PlasticSCM/Assets/Images/iconmergecategory.png.meta
new file mode 100644
index 0000000..269e74a
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconmergecategory.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 3aeafd5c84842b44e985f9cc2bd28e74
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: cf092caabecd8264094c6488617251c0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconmergeconflict.png b/Editor/PlasticSCM/Assets/Images/iconmergeconflict.png
new file mode 100644
index 0000000..411365e
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconmergeconflict.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconmergeconflict.png.meta b/Editor/PlasticSCM/Assets/Images/iconmergeconflict.png.meta
new file mode 100644
index 0000000..d53c4b9
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconmergeconflict.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 3ebdd5b3c161fc343a4bbc3ea42da8ca
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: ab0a592337ba8d0469bf6a67c8e534c5
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconmerged.png b/Editor/PlasticSCM/Assets/Images/iconmerged.png
new file mode 100644
index 0000000..1c505a7
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconmerged.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconmerged.png.meta b/Editor/PlasticSCM/Assets/Images/iconmerged.png.meta
new file mode 100644
index 0000000..c67419b
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconmerged.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 36b376cee8459d34e8aefb062d29bcf2
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: c056de739ba8a754e88c68e295c053c8
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconmergelink.png b/Editor/PlasticSCM/Assets/Images/iconmergelink.png
new file mode 100644
index 0000000..3c903ab
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconmergelink.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconmergelink.png.meta b/Editor/PlasticSCM/Assets/Images/iconmergelink.png.meta
new file mode 100644
index 0000000..cf41dab
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconmergelink.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 120bf54dff785a0429b068b814e9c12a
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 51133015e8cc06a4f93e26b9c867c6b7
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconmoved.png b/Editor/PlasticSCM/Assets/Images/iconmoved.png
new file mode 100644
index 0000000..0a8fdfe
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconmoved.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconmoved.png.meta b/Editor/PlasticSCM/Assets/Images/iconmoved.png.meta
new file mode 100644
index 0000000..30ba992
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconmoved.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 8a6cca56e2b63344eb4769cd92d93ffb
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: bc35d29e7eb93be45b838123254b4817
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconplastic.png b/Editor/PlasticSCM/Assets/Images/iconplastic.png
new file mode 100644
index 0000000..68d240e
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconplastic.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconplastic.png.meta b/Editor/PlasticSCM/Assets/Images/iconplastic.png.meta
new file mode 100644
index 0000000..962dee4
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconplastic.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 3042b019b052942a1baf7aa49d7ca6bb
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: d9b5aff1687365c4594054ad50a85208
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconplasticview.png b/Editor/PlasticSCM/Assets/Images/iconplasticview.png
new file mode 100644
index 0000000..0a8eba4
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconplasticview.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconplasticview.png.meta b/Editor/PlasticSCM/Assets/Images/iconplasticview.png.meta
new file mode 100644
index 0000000..35e45d3
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconplasticview.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: dcb2ee37925b97e438ae244996d81a55
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 7c561411695e1df4f9aff8eb33039699
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconplasticview@2x.png b/Editor/PlasticSCM/Assets/Images/iconplasticview@2x.png
new file mode 100644
index 0000000..4e454a9
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconplasticview@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconplasticview@2x.png.meta b/Editor/PlasticSCM/Assets/Images/iconplasticview@2x.png.meta
new file mode 100644
index 0000000..7ba7df6
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconplasticview@2x.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 97a4e2b6ae08b1140a5ba9e22953e029
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 21556f2e15f899945a3a0e228074cca7
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconpressedclosebutton.png b/Editor/PlasticSCM/Assets/Images/iconpressedclosebutton.png
new file mode 100644
index 0000000..04fac2b
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconpressedclosebutton.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconpressedclosebutton.png.meta b/Editor/PlasticSCM/Assets/Images/iconpressedclosebutton.png.meta
new file mode 100644
index 0000000..a21b033
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconpressedclosebutton.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 94fe868620119564f9474f40cd6145aa
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: aa638c69e6242ec4b8eb19471573021d
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/iconrepository.png b/Editor/PlasticSCM/Assets/Images/iconrepository.png
new file mode 100644
index 0000000..8279df0
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/iconrepository.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/iconrepository.png.meta b/Editor/PlasticSCM/Assets/Images/iconrepository.png.meta
new file mode 100644
index 0000000..07c3ece
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/iconrepository.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: ed64f3a17f2ede646be21ed6edc9161a
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 8173c07773604c94cb603c52c81f07c2
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/ignored.png b/Editor/PlasticSCM/Assets/Images/ignored.png
new file mode 100644
index 0000000..07adfff
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/ignored.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/ignored.png.meta b/Editor/PlasticSCM/Assets/Images/ignored.png.meta
new file mode 100644
index 0000000..8128c14
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/ignored.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 595bc97bc8e1e0b46bd4c2148ba3723a
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 655ad771794337e4ab6f861606074414
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/loading.png b/Editor/PlasticSCM/Assets/Images/loading.png
new file mode 100644
index 0000000..8e8913e
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/loading.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/loading.png.meta b/Editor/PlasticSCM/Assets/Images/loading.png.meta
new file mode 100644
index 0000000..9744cb3
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/loading.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: c6b1bcaa3f4767141acd747384dbb276
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/loading@2x.png b/Editor/PlasticSCM/Assets/Images/loading@2x.png
new file mode 100644
index 0000000..f4dc7ad
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/loading@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/loading@2x.png.meta b/Editor/PlasticSCM/Assets/Images/loading@2x.png.meta
new file mode 100644
index 0000000..b07396c
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/loading@2x.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 5dbc069eb79bd4d43840847264d6d956
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/notondisk.png b/Editor/PlasticSCM/Assets/Images/notondisk.png
new file mode 100644
index 0000000..cfb6efe
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/notondisk.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/notondisk.png.meta b/Editor/PlasticSCM/Assets/Images/notondisk.png.meta
new file mode 100644
index 0000000..68fe308
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/notondisk.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: b205f4b28f59dda49af458b35d8a3ff3
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: e02a96272b03dc940a5c97cdd9c80cbb
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/ok.png b/Editor/PlasticSCM/Assets/Images/ok.png
new file mode 100644
index 0000000..de885fb
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/ok.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/ok.png.meta b/Editor/PlasticSCM/Assets/Images/ok.png.meta
new file mode 100644
index 0000000..0effd2c
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/ok.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 3238dca1e9ea9fb4aa64b28298ba6dbd
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 98326ccc2ab8d1d448abb288e6f22fd5
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/step1.png b/Editor/PlasticSCM/Assets/Images/step1.png
new file mode 100644
index 0000000..52d51f6
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/step1.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/step1.png.meta b/Editor/PlasticSCM/Assets/Images/step1.png.meta
new file mode 100644
index 0000000..8c264b6
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/step1.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 9ce84ff0fdeb13d4a83f077d075dd9a5
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 2a5833ff9c679be418315674ccb7482f
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/step1@2x.png b/Editor/PlasticSCM/Assets/Images/step1@2x.png
new file mode 100644
index 0000000..40ffb08
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/step1@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/step1@2x.png.meta b/Editor/PlasticSCM/Assets/Images/step1@2x.png.meta
new file mode 100644
index 0000000..fc2b84a
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/step1@2x.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: affeade9874cf2347abb155e8d0db4d8
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 4f1b6ce3688a9a64e86dee209943d725
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/step2.png b/Editor/PlasticSCM/Assets/Images/step2.png
new file mode 100644
index 0000000..15e8706
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/step2.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/step2.png.meta b/Editor/PlasticSCM/Assets/Images/step2.png.meta
new file mode 100644
index 0000000..4c972fe
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/step2.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: cd0b17b71a5c498428ee91dee8a78a88
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 979066fc4d9879f44a7ee41dfc9beb3a
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/step2@2x.png b/Editor/PlasticSCM/Assets/Images/step2@2x.png
new file mode 100644
index 0000000..150b7a2
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/step2@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/step2@2x.png.meta b/Editor/PlasticSCM/Assets/Images/step2@2x.png.meta
new file mode 100644
index 0000000..baf3314
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/step2@2x.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 0029170d14ce6c04c9f45c22cdae5559
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: d060e84faa6847747b65b345817e0e2d
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/step3.png b/Editor/PlasticSCM/Assets/Images/step3.png
new file mode 100644
index 0000000..51c7beb
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/step3.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/step3.png.meta b/Editor/PlasticSCM/Assets/Images/step3.png.meta
new file mode 100644
index 0000000..8a5cf8c
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/step3.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 69899ed144c8eea4baea48b858b37746
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 4f466ecde62957f4299e26e9078e5bca
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/step3@2x.png b/Editor/PlasticSCM/Assets/Images/step3@2x.png
new file mode 100644
index 0000000..21b175a
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/step3@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/step3@2x.png.meta b/Editor/PlasticSCM/Assets/Images/step3@2x.png.meta
new file mode 100644
index 0000000..521d888
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/step3@2x.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 36e6970b84831434a9eac79abd03700b
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 44240d8e1e3c23b40828b1dbc1373d17
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/stepok.png b/Editor/PlasticSCM/Assets/Images/stepok.png
new file mode 100644
index 0000000..a0542f3
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/stepok.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/stepok.png.meta b/Editor/PlasticSCM/Assets/Images/stepok.png.meta
new file mode 100644
index 0000000..508dbc0
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/stepok.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: d4780dc1205c7c7478c970d8c61d24e8
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 67fb1e5b278a0184bb092fad0b765884
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/stepok@2x.png b/Editor/PlasticSCM/Assets/Images/stepok@2x.png
new file mode 100644
index 0000000..c9955d4
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/stepok@2x.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/stepok@2x.png.meta b/Editor/PlasticSCM/Assets/Images/stepok@2x.png.meta
new file mode 100644
index 0000000..3e45f67
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/stepok@2x.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: be340a165cb9c8d4cb50f1deeb51d4ea
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: e76902e05813dfe40936af244bf847b6
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Images/xlink.png b/Editor/PlasticSCM/Assets/Images/xlink.png
new file mode 100644
index 0000000..656e251
Binary files /dev/null and b/Editor/PlasticSCM/Assets/Images/xlink.png differ
diff --git a/Editor/PlasticSCM/Assets/Images/xlink.png.meta b/Editor/PlasticSCM/Assets/Images/xlink.png.meta
new file mode 100644
index 0000000..22ae29e
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Images/xlink.png.meta
@@ -0,0 +1,84 @@
+fileFormatVersion: 2
+guid: 556a2f3b046024d4c9621c1b4be5f0c1
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 0fdb91cf53f55e240a89d1b7263f1c0b
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Layouts.meta b/Editor/PlasticSCM/Assets/Layouts.meta
new file mode 100644
index 0000000..c7ac7ef
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ceb47f1768ea33a4984627a59921a4ee
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml b/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml
new file mode 100644
index 0000000..6dc87af
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml
@@ -0,0 +1,28 @@
+<UXML xmlns="UnityEngine.UIElements">
+    <VisualElement class="flex-container main">
+            <Image name="buho" />
+        <VisualElement class="form">
+            <Label name="createLabel" class="title" />
+            <VisualElement class="field">
+                <TextField name="orgName"/>
+                <Label name="orgNameNotification" class="notification"/>
+            </VisualElement>
+            <VisualElement name="datacenter" class="field">
+                <Label name="datacenterLabel" class="field-label"/>
+            </VisualElement>
+            <VisualElement class="field">
+                <Toggle name="encryptData" />
+                <Label name="encryptExplanation"/>
+                <Button name="encryptLearnMore" class="anchor"/>
+            </VisualElement>
+        </VisualElement>
+    </VisualElement>
+    <VisualElement name="gettingDatacenters" class="hidden">
+        <VisualElement name="gdSpinner"/>
+        <Label name="gdLabel" />
+    </VisualElement>
+    <VisualElement class="footer">
+        <Button name="back" />
+        <Button name="create" />
+    </VisualElement>
+</UXML>
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml.meta b/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml.meta
new file mode 100644
index 0000000..1a8f932
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/CreateOrganizationPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 544ec465751093542a3bb5d42b6b5689
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/PlasticSCM/Assets/Layouts/CreatedOrganizationPanel.uxml b/Editor/PlasticSCM/Assets/Layouts/CreatedOrganizationPanel.uxml
new file mode 100644
index 0000000..18a9ba2
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/CreatedOrganizationPanel.uxml
@@ -0,0 +1,12 @@
+<UXML xmlns="UnityEngine.UIElements">
+    <VisualElement class="flex-container main">
+        <Image name="buho" />
+        <VisualElement class="form">
+            <Label name="createdTitle" class="title" />
+            <Label name="createdExplanation" />
+        </VisualElement>
+    </VisualElement>
+    <VisualElement class="footer">
+        <Button name="continue" />
+    </VisualElement>
+</UXML>
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Layouts/CreatedOrganizationPanel.uxml.meta b/Editor/PlasticSCM/Assets/Layouts/CreatedOrganizationPanel.uxml.meta
new file mode 100644
index 0000000..98d9137
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/CreatedOrganizationPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 0a73ab5bab69746419e8e0ff89c8e816
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/PlasticSCM/Assets/Layouts/OrganizationPanel.uxml b/Editor/PlasticSCM/Assets/Layouts/OrganizationPanel.uxml
new file mode 100644
index 0000000..4bd5302
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/OrganizationPanel.uxml
@@ -0,0 +1,27 @@
+<UXML xmlns="UnityEngine.UIElements">
+    <VisualElement class="flex-container main">
+        <Image name="buho" />
+        <VisualElement>
+            <Label name="confirmationMessage" class="title" />
+            <VisualElement name="joinSingleOrganization" class="organization-section display-none">
+                <Label name="joinSingleOrganizationLabel" />
+                <VisualElement class="align-end">
+                    <Button name="joinSingleOrganizationButton" class="organization-button" />
+                </VisualElement>
+            </VisualElement>
+          
+            <VisualElement name="joinMultipleOrganizations" class="organization-section display-none">
+                <Label name="joinMultipleOrganizationsLabel" />
+                <VisualElement class="row">
+                    <VisualElement name="organizationDropdown" />
+                    <Button name="joinMultipleOrganizationsButton" class="organization-button" />
+                </VisualElement>
+            </VisualElement>
+          
+            <VisualElement name="createOrganization" class="organization-section row">
+                <Label name="createOrganizationLabel" />
+                <Button name="createOrganizationButton" class="organization-button" />
+            </VisualElement>
+        </VisualElement>
+    </VisualElement>
+</UXML>
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Layouts/OrganizationPanel.uxml.meta b/Editor/PlasticSCM/Assets/Layouts/OrganizationPanel.uxml.meta
new file mode 100644
index 0000000..e51c925
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/OrganizationPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b6420407edc75d04f89d57eb2fcc314b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/PlasticSCM/Assets/Layouts/SSOSignUpPanel.uxml b/Editor/PlasticSCM/Assets/Layouts/SSOSignUpPanel.uxml
new file mode 100644
index 0000000..8a6fc3a
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/SSOSignUpPanel.uxml
@@ -0,0 +1,49 @@
+<UXML xmlns:ui="UnityEngine.Experimental.UIElements">
+  <ui:VisualElement class="flex-container main">
+    <ui:Image name="buho" />
+    
+    <ui:VisualElement name="signUpForm">
+      <ui:Label text="Sign Up" name="signUpLabel" class="title" />
+
+      <ui:VisualElement name="email">
+        <ui:TextField name="emailField" class="column" label="Email:" password="false"/>
+        <ui:Label name="emailNotification" class="hidden" />
+      </ui:VisualElement>
+      
+      <ui:VisualElement name="password" class="row">
+        <ui:TextField name="passwordField" class="column password" label="Password:" password="true"/>
+        <ui:TextField name="confirmPasswordField" class="column password" label="Confirm Password:" password="true"/>
+      </ui:VisualElement>
+      <ui:Label name="passwordNotificationLabel" class="hidden" />
+
+      <ui:Button name="signUp" />
+
+      <ui:VisualElement name="policyContainer" class="row">
+        <ui:Label name="signUpAgreePt1" />
+        <ui:Button name="termsOfService" class="anchor" />
+        <ui:Label name="signUpAgreePt2" />
+        <ui:Button name="privacyPolicy" class="anchor" />
+      </ui:VisualElement>
+
+      <ui:VisualElement name="median" class="row horizontally-centered">
+        <ui:VisualElement name="dash" class="dash" />
+        <ui:Label name="or" />
+        <ui:VisualElement name="dash" class="dash" />
+      </ui:VisualElement>
+
+      <ui:VisualElement name="otherSignUpOptions" class="row">
+        <ui:Button name="unityIDButton" class="alternate-button"> 
+          <ui:Image name="unityIcon" class="icon" />
+        </ui:Button>
+        
+        <ui:Button name="googleButton" class="alternate-button">
+          <ui:Image name="googleIcon" class="icon" />
+        </ui:Button>
+      </ui:VisualElement>
+    </ui:VisualElement>
+  </ui:VisualElement>
+  <ui:VisualElement class="footer">
+    <ui:Label name="privacyStatementText" />
+    <ui:Button name="privacyStatement" class="anchor" />
+  </ui:VisualElement>
+</UXML>
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Layouts/SSOSignUpPanel.uxml.meta b/Editor/PlasticSCM/Assets/Layouts/SSOSignUpPanel.uxml.meta
new file mode 100644
index 0000000..e9f67b1
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/SSOSignUpPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 6dac85d7b8e76424ab582326c2cb5531
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/PlasticSCM/Assets/Layouts/SignInPanel.uxml b/Editor/PlasticSCM/Assets/Layouts/SignInPanel.uxml
new file mode 100644
index 0000000..1537e96
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/SignInPanel.uxml
@@ -0,0 +1,19 @@
+<UXML xmlns="UnityEngine.UIElements">
+    <VisualElement class="flex-container main">
+        <Image name="buho" />
+        <VisualElement>
+            <Label name="signInToPlasticSCM" class="title" />
+            <Button name="signInWithUnityId" class="sign-in-buttons">
+                <Image name="iconUnity" />
+            </Button>
+            <Button name="signInWithEmail" text="Sign in with Email">
+                <!-- TODO: Find correct mail icon -->
+                <Image name="iconEmail" />
+            </Button>
+        </VisualElement>
+    </VisualElement>
+    <VisualElement class="footer">
+        <Label name="privacyStatementText" />
+        <Button name="privacyStatement" class="anchor" />
+    </VisualElement>
+</UXML>
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Layouts/SignInPanel.uxml.meta b/Editor/PlasticSCM/Assets/Layouts/SignInPanel.uxml.meta
new file mode 100644
index 0000000..8a53d12
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/SignInPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 18b097dd2d10fb442a321314f4541401
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/PlasticSCM/Assets/Layouts/SignInWithEmailPanel.uxml b/Editor/PlasticSCM/Assets/Layouts/SignInWithEmailPanel.uxml
new file mode 100644
index 0000000..4d7d130
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/SignInWithEmailPanel.uxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<UXML
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="UnityEngine.UIElements"
+    xsi:noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd"
+    xsi:schemaLocation="UnityEngine.UIElements ../UIElementsSchema/UnityEngine.UIElements.xsd">
+
+    <VisualElement name="emailSignInContainer">
+        <VisualElement name="windowContainer">
+            <VisualElement name="imageContainer">
+                <Image name="buho"/>
+            </VisualElement>
+            <VisualElement name="loginContainer">
+                <Label name="signInLabel"/>
+                <TextField name="email"/>
+                <Label name="emailNotification"/>
+                <TextField name="password" password="true"/>
+                <Label name="passwordNotification"/>
+                <Button name="signIn"/>
+            </VisualElement>
+        </VisualElement>
+        <VisualElement name="backContainer">
+            <Button name="back"/>
+        </VisualElement>
+    </VisualElement>
+</UXML>
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Layouts/SignInWithEmailPanel.uxml.meta b/Editor/PlasticSCM/Assets/Layouts/SignInWithEmailPanel.uxml.meta
new file mode 100644
index 0000000..9bf132c
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/SignInWithEmailPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 0229db2477529f049aa3683cfba9d23b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/PlasticSCM/Assets/Layouts/TabView.uxml b/Editor/PlasticSCM/Assets/Layouts/TabView.uxml
new file mode 100644
index 0000000..fe7599f
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/TabView.uxml
@@ -0,0 +1,4 @@
+<UXML xmlns="UnityEngine.UIElements">
+	<VisualElement name="TabArea" class="flex-container" />
+	<VisualElement name="ContentArea" />
+</UXML>
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Layouts/TabView.uxml.meta b/Editor/PlasticSCM/Assets/Layouts/TabView.uxml.meta
new file mode 100644
index 0000000..5ec1d87
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/TabView.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: d0a8e201e79e1f441bdf295aef957220
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/PlasticSCM/Assets/Layouts/TeamEditionConfigurationWindow.uxml b/Editor/PlasticSCM/Assets/Layouts/TeamEditionConfigurationWindow.uxml
new file mode 100644
index 0000000..9e48d7b
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/TeamEditionConfigurationWindow.uxml
@@ -0,0 +1,42 @@
+<UXML xmlns="UnityEngine.UIElements">
+    <VisualElement class="container">
+        <Label name="plasticConfigurationTitle" />
+        <Label name="plasticConfigurationExplanation" class="sub-section" />
+    </VisualElement>
+    <VisualElement class="container">
+        <VisualElement class="sub-section">
+            <Label name="configurationServerInfo"></Label>
+            <VisualElement name="configurationServerInfoSection">
+                <VisualElement class="flex-container">
+                    <TextField name="serverTextField" class="grow" />
+                    <Button name="connect" />
+                </VisualElement>
+                <VisualElement class="flex-container">
+                    <Toggle name="useSslToogle" />
+                    <Label name="useSsl" />
+                </VisualElement>
+                <VisualElement>
+                    <Label name="connectedLabel" class="visibility-hidden" />
+                </VisualElement>
+            </VisualElement>
+            <Label name="configurationUserNameInfo" />
+            <Label name="configurationCredentialsInfo" class="display-none" />
+            <VisualElement class="flex-container">
+                <TextField name="userTextField" class="credentials" />
+                <TextField name="passwordTextField" class="credentials display-none" />
+                <Button name="check" />
+                <VisualElement name="credentialsPadding" class="grow" />
+            </VisualElement>
+            <Label name="credentialsOk" class="visibility-hidden" />
+            <VisualElement class="flex-container">
+                <VisualElement name="spinnerContainer" class="visibility-hidden"/>
+                <Label name="spinnerLabel" class="visibility-hidden"/>
+            </VisualElement>
+        </VisualElement>
+    </VisualElement>
+    <VisualElement class="container flex-container last">
+        <VisualElement class="grow"></VisualElement>"
+        <Button name="okButton" />
+        <Button name="cancelButton" />
+    </VisualElement>
+</UXML>
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Layouts/TeamEditionConfigurationWindow.uxml.meta b/Editor/PlasticSCM/Assets/Layouts/TeamEditionConfigurationWindow.uxml.meta
new file mode 100644
index 0000000..34ccec8
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/TeamEditionConfigurationWindow.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 26d3a583da6079145a52a8bef4beb6c5
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/PlasticSCM/Assets/Layouts/WaitingSignInPanel.uxml b/Editor/PlasticSCM/Assets/Layouts/WaitingSignInPanel.uxml
new file mode 100644
index 0000000..d14b4f7
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/WaitingSignInPanel.uxml
@@ -0,0 +1,13 @@
+<UXML xmlns="UnityEngine.UIElements">
+    <VisualElement class="flex-container main">
+        <Image name="buho" />
+        <VisualElement>
+            <Label name="signInToPlasticSCM" class="title" />
+            <Label name="completeSignInOnBrowser" />
+            <VisualElement class="flex-container wait">
+                <Label name="oAuthSignInCheckMessage" class="wait-text" />
+                <Button name="cancelButton"></Button>
+            </VisualElement>
+        </VisualElement>
+    </VisualElement>
+</UXML>
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Layouts/WaitingSignInPanel.uxml.meta b/Editor/PlasticSCM/Assets/Layouts/WaitingSignInPanel.uxml.meta
new file mode 100644
index 0000000..1cecd79
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Layouts/WaitingSignInPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 913c727eecab25c489fa2adbad9c9ab8
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/PlasticSCM/Assets/Styles.meta b/Editor/PlasticSCM/Assets/Styles.meta
new file mode 100644
index 0000000..7503d2a
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5355983268a982c46bd52eb66f19b1b9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Assets/Styles/CreateOrganizationPanel.uss b/Editor/PlasticSCM/Assets/Styles/CreateOrganizationPanel.uss
new file mode 100644
index 0000000..30e24fd
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/CreateOrganizationPanel.uss
@@ -0,0 +1,74 @@
+CreateOrganizationPanel {
+    width: 100%;
+}
+
+.form {
+    width: 55%;
+    height: 100%;
+    flex-direction: column;
+    padding: 0 10px;
+}
+
+.field {
+    font-size: 14px;
+    margin-bottom: 10px;
+    width: 100%;
+}
+
+.field TextField {
+    flex-direction: column;
+}
+
+.field TextField Label, .field-label {
+    margin: 5px;
+}
+
+#datacenter {
+    margin-bottom: 35px;
+}
+
+Label {
+    white-space: normal;
+}
+
+.hidden {
+    visibility: hidden;
+    height: 0;
+}
+
+.notification {
+    color: red;
+    height: 15px;
+    margin-bottom: 5px;
+}
+
+.footer {
+    flex-direction: row;
+    justify-content: flex-end;
+    padding: 0 10px;
+}
+
+.footer Button {
+    padding: 5px 7px;
+    margin-top: 10px;
+    border-width: 2px;
+    border-radius: 0;
+}
+
+#gettingDatacenters {
+    align-self: center;
+    height: 30px;
+    flex-direction: row;
+}
+
+#gdSpinner {
+    margin-right: 5px;
+}
+
+#encryptExplanation {
+    color: grey;
+}
+
+#encryptLearnMore {
+    width: 65px;
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/CreateOrganizationPanel.uss.meta b/Editor/PlasticSCM/Assets/Styles/CreateOrganizationPanel.uss.meta
new file mode 100644
index 0000000..fa9400d
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/CreateOrganizationPanel.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 55ebb8b19849d1447909e8355a13a5f9
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/CreatedOrganizationPanel.uss b/Editor/PlasticSCM/Assets/Styles/CreatedOrganizationPanel.uss
new file mode 100644
index 0000000..99ac869
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/CreatedOrganizationPanel.uss
@@ -0,0 +1,30 @@
+.form {
+    width: 55%;
+    height: 100%;
+    flex-direction: column;
+    padding: 0 10px;
+}
+
+.field {
+    flex-direction: column;
+    font-size: 14px;
+    margin-bottom: 20px;
+}
+
+Label {
+    white-space: normal;
+}
+
+.footer {
+    flex-direction: row;
+    justify-content: flex-end;
+    padding: 0 10px;
+}
+
+.footer Button {
+    padding: 5px 7px;
+    margin-top: 10px;
+    border-width: 2px;
+    border-radius: 0;
+}
+
diff --git a/Editor/PlasticSCM/Assets/Styles/CreatedOrganizationPanel.uss.meta b/Editor/PlasticSCM/Assets/Styles/CreatedOrganizationPanel.uss.meta
new file mode 100644
index 0000000..3f6366d
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/CreatedOrganizationPanel.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d69f9cc1b626cc64c802f5b33ce10dcf
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/OrganizationPanel.uss b/Editor/PlasticSCM/Assets/Styles/OrganizationPanel.uss
new file mode 100644
index 0000000..354a43b
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/OrganizationPanel.uss
@@ -0,0 +1,25 @@
+.organization-section {
+    margin: 10px 0px;
+}
+
+.organization-button {
+    width: 15%;
+}
+
+.align-end {
+    align-items: flex-end;
+}
+
+#organizationDropdown {
+    width: 85%;
+    margin-top: 3px;
+}
+
+#createOrganization {
+    margin: 25px 0px;
+}
+
+#createOrganizationLabel {
+    width: 83%;
+    margin-top: 3px;
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/OrganizationPanel.uss.meta b/Editor/PlasticSCM/Assets/Styles/OrganizationPanel.uss.meta
new file mode 100644
index 0000000..613e54c
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/OrganizationPanel.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 642639f75f2dfbd4ab01e6708b58f304
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/SSOSignUpPanel.uss b/Editor/PlasticSCM/Assets/Styles/SSOSignUpPanel.uss
new file mode 100644
index 0000000..c33a678
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SSOSignUpPanel.uss
@@ -0,0 +1,92 @@
+/* Basic Classes */
+.row {
+	flex-direction: row;
+}
+
+.column {
+    flex-direction: column;
+}
+
+.horizontally-centered {
+    justify-content: center;
+}
+
+.hidden {
+    visibility: hidden;
+}
+
+SignUp {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: stretch;
+    align-content: stretch;
+    padding: 20px 0;
+    height: 100%;
+}
+
+#signUpForm {
+    width: 420px;
+}
+
+#email {
+    margin-bottom: 20px;
+}
+
+TextField {
+    flex-direction: column;
+    font-size: 14px;
+}
+
+#password {
+    height: 42px;
+}
+
+.password {
+    width: 48.5%;
+    margin-bottom: 1px;
+}
+
+#signUp {
+    margin-top: 20px;
+    height: 30px;
+}
+
+#policyContainer {
+    margin: 5px;
+    margin-left: -8px;
+}
+
+#median {
+    margin-top: 15px;
+    margin-left: -8px;
+}
+
+.dash {
+    border-top-width: 0.5px;
+    border-color: rgba(196, 196, 196, 1);
+    width: 49%;
+    height: 1px;
+    margin: 8px 3px 8px 3px;
+}
+
+.alternate-button {
+    width: 48.5%;
+    height: 30px;
+}
+
+.icon {
+    height: 25px;
+    width: 25px;
+}
+
+#unityIDButton {
+    color: white;
+    background-color: black;
+}
+
+#googleButton {
+    color: black;
+    background-color: rgba(66, 133, 244, 1);
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/SSOSignUpPanel.uss.meta b/Editor/PlasticSCM/Assets/Styles/SSOSignUpPanel.uss.meta
new file mode 100644
index 0000000..80b05e9
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SSOSignUpPanel.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3337338cbeb79a24cba584de64190044
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInPanel.uss b/Editor/PlasticSCM/Assets/Styles/SignInPanel.uss
new file mode 100644
index 0000000..7fc3bbf
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInPanel.uss
@@ -0,0 +1,17 @@
+.sign-in-buttons {
+    margin-top: 5px;
+    margin-bottom: 5px;
+    width: 420px;
+    height: 36px;
+    font-size: 14px;
+}
+
+#iconUnity, #iconEmail {
+    width: 32px;
+    height: 32px
+}
+
+#signInWithUnityId {
+    background-color: #000000;
+    color: #C4C4C4;
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInPanel.uss.meta b/Editor/PlasticSCM/Assets/Styles/SignInPanel.uss.meta
new file mode 100644
index 0000000..e985a41
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInPanel.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c673e4e20ea67ab40a4661592f51aa99
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInSignUp.uss b/Editor/PlasticSCM/Assets/Styles/SignInSignUp.uss
new file mode 100644
index 0000000..ab37bde
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInSignUp.uss
@@ -0,0 +1,60 @@
+.display-none {
+    display: none;
+}
+
+.row {
+    flex-direction: row;
+}
+
+.flex-container {
+    display: flex;
+    flex-direction: row;
+}
+
+.main {
+    margin-top: 20px;
+    padding-left: 20px;
+    padding-right: 20px;
+}
+
+#buho {
+    align-content: center;
+    width: 45%;
+    height: 275px;
+    margin-top: 30px;
+    padding: 20px;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-end;
+}
+
+.title {
+    margin: 20px 0px;
+    font-size: 18px;
+}
+
+.anchor {
+    color: #2196F3;
+    border-bottom-color: #2196F3;
+    padding: 0px;
+    margin: 0px;
+    background-color: transparent;
+    border-left-width: 0px;
+    border-top-width: 0px;
+    border-right-width: 0px;
+    border-bottom-width: 1px;
+}
+
+Label {
+    white-space: normal;
+}
+
+.footer {
+    position: absolute;
+    margin: 20px 10px 0px 10px;
+    margin-top: 46%;
+}
+
+#privacyStatement {
+    align-self: flex-start;
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInSignUp.uss.meta b/Editor/PlasticSCM/Assets/Styles/SignInSignUp.uss.meta
new file mode 100644
index 0000000..8f6c104
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInSignUp.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e29c9d2208f5c2a48a15e02f3fc55a4a
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.dark.uss b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.dark.uss
new file mode 100644
index 0000000..85d1525
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.dark.uss
@@ -0,0 +1 @@
+VisualElement {}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.dark.uss.meta b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.dark.uss.meta
new file mode 100644
index 0000000..82ed8fa
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.dark.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1790de37fb6fed648a08bff70675c558
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.light.uss b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.light.uss
new file mode 100644
index 0000000..c6eeb01
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.light.uss
@@ -0,0 +1,3 @@
+SignInWithEmailPanel {
+    background-color: white;
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.light.uss.meta b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.light.uss.meta
new file mode 100644
index 0000000..251f886
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.light.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fe8917db1671187439305e5911d17b6f
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.uss b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.uss
new file mode 100644
index 0000000..72ab9ae
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.uss
@@ -0,0 +1,85 @@
+SignInWithEmailPanel {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: stretch;
+    align-content: stretch;
+    padding: 20px 0;
+    height: 100%;
+}
+
+#imageContainer {
+    flex-direction: row;
+    align-content: center;
+    width: 45%;
+    height: 100%;
+    padding: 20px 0;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-end;
+}
+
+#imageContainer Image {
+    padding-top: 50px;
+    padding-right: 50px;
+}
+
+#windowContainer {
+    height: 100%;
+    flex-grow: 1;
+    flex-direction: row;
+    margin-bottom: 30px;
+}
+
+#loginContainer {
+    width: 55%;
+    height: 100%;
+    flex-direction: column;
+    padding: 0 10px;
+}
+
+#signInLabel {
+    margin-top: 60px;
+    margin-bottom: 30px;
+    font-size: 18px;
+}
+
+#loginContainer TextField {
+    flex-direction: column;
+    font-size: 14px;
+}
+
+#loginContainer TextInput {
+    background-color: rgba(0, 0, 0, 0);
+    border-radius: 0;
+    padding: 2px;
+}
+
+#loginContainer TextField Label {
+    margin: 5px;
+}
+
+#emailNotification, #passwordNotification {
+    color: red;
+    height: 15px;
+    margin-bottom: 5px;
+}
+
+#loginContainer Button {
+    padding: 7px;
+    margin-top: 10px;
+    border-width: 2px;
+    border-color: rgb(18, 129, 218);
+    border-radius: 0;
+}
+
+#back {
+    align-self: center;
+    color: rgb(18, 129, 218);
+    border-width: 0 0 1px 0;
+    border-color: rgb(18, 129, 218);
+    background-color: rgba(0, 0, 0, 0);
+    border-radius: 0;
+    margin-top: 20px;
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.uss.meta b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.uss.meta
new file mode 100644
index 0000000..13fbc29
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/SignInWithEmailPanel.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b37675bc656348c429a6c56b2eda1345
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/TabView.dark.uss b/Editor/PlasticSCM/Assets/Styles/TabView.dark.uss
new file mode 100644
index 0000000..f0efaa5
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/TabView.dark.uss
@@ -0,0 +1,12 @@
+#TabArea {
+    background-color: #282828;
+}
+
+Button {
+    background-color: #282828;
+}
+
+    Button.active {
+        background-color: #383838;
+        border-bottom-color: #383838;
+    }
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/TabView.dark.uss.meta b/Editor/PlasticSCM/Assets/Styles/TabView.dark.uss.meta
new file mode 100644
index 0000000..b1240e1
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/TabView.dark.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8a99a1e5755f6ef45bbe46b32552be14
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/TabView.light.uss b/Editor/PlasticSCM/Assets/Styles/TabView.light.uss
new file mode 100644
index 0000000..bfe79f4
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/TabView.light.uss
@@ -0,0 +1,12 @@
+#TabArea {
+    background-color: #a5a5a5;
+}
+
+Button {
+    background-color: #a5a5a5;
+}
+
+    Button.active {
+        background-color: #cbcbcb;
+        border-bottom-color: #cbcbcb;
+    }
diff --git a/Editor/PlasticSCM/Assets/Styles/TabView.light.uss.meta b/Editor/PlasticSCM/Assets/Styles/TabView.light.uss.meta
new file mode 100644
index 0000000..99ff279
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/TabView.light.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b9e2b8f6b44dca549a74b3e867ca1468
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/TabView.uss b/Editor/PlasticSCM/Assets/Styles/TabView.uss
new file mode 100644
index 0000000..b04bc29
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/TabView.uss
@@ -0,0 +1,10 @@
+.flex-container {
+    display: flex;
+    flex-direction: row;
+}
+
+Button {
+    padding-bottom: 2px;
+    margin-bottom: 0px;
+    border-width: 0px;
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/TabView.uss.meta b/Editor/PlasticSCM/Assets/Styles/TabView.uss.meta
new file mode 100644
index 0000000..db9b889
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/TabView.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 88da5407899aaaf448a40c85888108ae
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/TeamEditionConfigurationWindow.uss b/Editor/PlasticSCM/Assets/Styles/TeamEditionConfigurationWindow.uss
new file mode 100644
index 0000000..f8b8d2f
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/TeamEditionConfigurationWindow.uss
@@ -0,0 +1,74 @@
+#configurationServerInfoSection {
+    margin-bottom: 40px;
+}
+
+#spinnerLabel {
+    margin-left: 2px;
+}
+
+#connectedLabel {
+    -unity-text-align: middle-right;
+}
+
+#credentialsOk {
+    -unity-text-align: middle-right;
+}
+
+#plasticConfigurationTitle {
+    font-size: 18px;
+    margin-bottom: 10px;
+}
+
+.container {
+    padding: 10px;
+    border-bottom-width: 1px;
+    border-bottom-color: #999999;
+}
+
+.container.last {
+    border-bottom-width: 0px;
+}
+
+.credentials {
+    width: 265px;
+}
+
+.display-none {
+    display: none;
+}
+
+.flex-container {
+    display: flex;
+    flex-direction: row;
+}
+
+.grow {
+    flex-grow: 1;
+}
+
+.sub-section {
+    margin-left: 10px;
+}
+
+.visibility-hidden {
+    visibility: hidden;
+}
+
+.error {
+    color: #FF0000;
+}
+
+Label {
+    white-space: normal;
+}
+
+TextField {
+    margin-left: 0px;
+    margin-top: 3px;
+    margin-right: 10px;
+    margin-bottom: 3px;
+}
+
+Toggle {
+    margin-left: 0px;
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/TeamEditionConfigurationWindow.uss.meta b/Editor/PlasticSCM/Assets/Styles/TeamEditionConfigurationWindow.uss.meta
new file mode 100644
index 0000000..e443cdf
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/TeamEditionConfigurationWindow.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1cd69f37df825af4385cd9efe745fc30
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/Assets/Styles/WaitingSignInPanel.uss b/Editor/PlasticSCM/Assets/Styles/WaitingSignInPanel.uss
new file mode 100644
index 0000000..3aad90f
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/WaitingSignInPanel.uss
@@ -0,0 +1,13 @@
+.wait {
+    margin-top: 20px;
+}
+
+.wait-text {
+    flex-grow: 1;
+    -unity-text-align: middle-left;
+}
+
+Button {
+    width: 70px;
+    height: 40px;
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Assets/Styles/WaitingSignInPanel.uss.meta b/Editor/PlasticSCM/Assets/Styles/WaitingSignInPanel.uss.meta
new file mode 100644
index 0000000..d6a6d9d
--- /dev/null
+++ b/Editor/PlasticSCM/Assets/Styles/WaitingSignInPanel.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 90945345530e7174eb4f0575a0bec0bf
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Editor/PlasticSCM/AssetsUtils.meta b/Editor/PlasticSCM/AssetsUtils.meta
new file mode 100644
index 0000000..92b82eb
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b32be061a815d6947bc3594cdcb94a1c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/AssetsPath.cs b/Editor/PlasticSCM/AssetsUtils/AssetsPath.cs
new file mode 100644
index 0000000..8ed940e
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/AssetsPath.cs
@@ -0,0 +1,71 @@
+using System.IO;
+using System.Reflection;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.Common;
+using Codice.Utils;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.AssetUtils
+{
+    internal static class AssetsPath
+    {
+        internal static string GetLayoutsFolderRelativePath()
+        {
+            return string.Concat(mAssetsFolderLocation, "/Layouts");
+        }
+
+        internal static string GetStylesFolderRelativePath()
+        {
+            return string.Concat(mAssetsFolderLocation, "/Styles");
+        }
+
+        internal static string GetImagesFolderRelativePath()
+        {
+            return string.Concat(mAssetsFolderLocation, "/Images");
+        }
+
+        internal static string GetRelativePath(string fullPath)
+        {
+            return PathHelper.GetRelativePath(
+                mProjectFullPath, fullPath).Substring(1);
+        }
+
+        internal static string GetFullPath(Object obj)
+        {
+            string relativePath = AssetDatabase.GetAssetPath(obj);
+
+            if (string.IsNullOrEmpty(relativePath))
+                return null;
+
+            return Path.GetFullPath(relativePath);
+        }
+
+        static AssetsPath()
+        {
+            mAssetsFolderLocation = (IsRunningAsUPMPackage()) ?
+                "Packages/com.unity.collab-proxy/Editor/PlasticSCM/Assets" :
+                "Assets/Plugins/PlasticSCM/Editor/Assets";
+        }
+
+        static bool IsRunningAsUPMPackage()
+        {
+            string unityPlasticDllPath = Path.GetFullPath(
+                AssemblyLocation.GetAssemblyDirectory(
+                    Assembly.GetAssembly(typeof(PlasticLocalization))));
+
+            return Directory.Exists(
+                Path.GetFullPath(Path.Combine(
+                    unityPlasticDllPath,
+                    // assets relative path when running as a UPM package
+                    "../../../Editor/PlasticSCM/Assets")));
+        }
+
+        static string mProjectFullPath = ProjectPath.
+            FromApplicationDataPath(Application.dataPath);
+
+        static string mAssetsFolderLocation;
+    }
+}
diff --git a/Editor/PlasticSCM/AssetsUtils/AssetsPath.cs.meta b/Editor/PlasticSCM/AssetsUtils/AssetsPath.cs.meta
new file mode 100644
index 0000000..b9e65e5
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/AssetsPath.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a077a49d9db9de74f827f0568f6e65c2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/LoadAsset.cs b/Editor/PlasticSCM/AssetsUtils/LoadAsset.cs
new file mode 100644
index 0000000..5cd18a7
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/LoadAsset.cs
@@ -0,0 +1,46 @@
+using System;
+using System.IO;
+
+using UnityEditor;
+
+using Codice.Client.BaseCommands;
+
+namespace Unity.PlasticSCM.Editor.AssetUtils
+{
+    internal static class LoadAsset
+    {
+        internal static UnityEngine.Object FromChangeInfo(ChangeInfo changeInfo)
+        {
+            string changeFullPath = changeInfo.GetFullPath();
+
+            if (MetaPath.IsMetaPath(changeFullPath))
+                changeFullPath = MetaPath.GetPathFromMetaPath(changeFullPath);
+
+            return FromFullPath(changeFullPath);
+        }
+
+        static UnityEngine.Object FromFullPath(string fullPath)
+        {
+            if (!IsPathUnderProject(fullPath))
+                return null;
+
+            return AssetDatabase.LoadMainAssetAtPath(
+                AssetsPath.GetRelativePath(fullPath));
+        }
+
+        static bool IsPathUnderProject(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return false;
+
+            var fullPath = Path.GetFullPath(path).Replace('\\', '/');
+
+            return fullPath.StartsWith(
+                mProjectRelativePath,
+                StringComparison.OrdinalIgnoreCase);
+        }
+
+        static string mProjectRelativePath = 
+            Directory.GetCurrentDirectory().Replace('\\', '/') + '/';
+    }
+}
diff --git a/Editor/PlasticSCM/AssetsUtils/LoadAsset.cs.meta b/Editor/PlasticSCM/AssetsUtils/LoadAsset.cs.meta
new file mode 100644
index 0000000..917b0de
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/LoadAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 91f74d588534bef42ac4b919a2ece84a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/Processor.meta b/Editor/PlasticSCM/AssetsUtils/Processor.meta
new file mode 100644
index 0000000..394d043
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/Processor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e5a9787c5ed94504798db0c3330424fe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/Processor/AssetModificationProcessor.cs b/Editor/PlasticSCM/AssetsUtils/Processor/AssetModificationProcessor.cs
new file mode 100644
index 0000000..6e54c48
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/Processor/AssetModificationProcessor.cs
@@ -0,0 +1,52 @@
+using System.IO;
+
+using Unity.PlasticSCM.Editor.AssetsOverlays;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+
+namespace Unity.PlasticSCM.Editor.AssetUtils.Processor
+{
+    class AssetModificationProcessor : UnityEditor.AssetModificationProcessor
+    {
+        internal static bool IsEnabled { get; set; }
+
+        internal static void RegisterAssetStatusCache(
+            IAssetStatusCache assetStatusCache)
+        {
+            mAssetStatusCache = assetStatusCache;
+        }
+
+        static string[] OnWillSaveAssets(string[] paths)
+        {
+            if (!IsEnabled)
+                return paths;
+
+            PlasticAssetsProcessor.CheckoutOnSourceControl(paths);
+            return paths;
+        }
+
+        static bool IsOpenForEdit(string assetPath, out string message)
+        {
+            message = string.Empty;
+
+            if (!IsEnabled)
+                return true;
+
+            if (assetPath.StartsWith("ProjectSettings/"))
+                return true;
+
+            if (MetaPath.IsMetaPath(assetPath))
+                assetPath = MetaPath.GetPathFromMetaPath(assetPath);
+
+            AssetStatus status = mAssetStatusCache.GetStatusForPath(
+                Path.GetFullPath(assetPath));
+
+            if (ClassifyAssetStatus.IsAdded(status) ||
+                ClassifyAssetStatus.IsCheckedOut(status))
+                return true;
+
+            return !ClassifyAssetStatus.IsControlled(status);
+        }
+
+        static IAssetStatusCache mAssetStatusCache;
+    }
+}
diff --git a/Editor/PlasticSCM/AssetsUtils/Processor/AssetModificationProcessor.cs.meta b/Editor/PlasticSCM/AssetsUtils/Processor/AssetModificationProcessor.cs.meta
new file mode 100644
index 0000000..7f91928
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/Processor/AssetModificationProcessor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c53c624438663f74ab67fbdf8869ae18
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/Processor/AssetPostprocessor.cs b/Editor/PlasticSCM/AssetsUtils/Processor/AssetPostprocessor.cs
new file mode 100644
index 0000000..7bb6bbe
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/Processor/AssetPostprocessor.cs
@@ -0,0 +1,32 @@
+namespace Unity.PlasticSCM.Editor.AssetUtils.Processor
+{
+    class AssetPostprocessor : UnityEditor.AssetPostprocessor
+    {
+        internal static bool IsEnabled { get; set; }
+
+        static void OnPostprocessAllAssets(
+            string[] importedAssets,
+            string[] deletedAssets,
+            string[] movedAssets,
+            string[] movedFromAssetPaths)
+        {
+            if (!IsEnabled)
+                return;
+
+            for (int i = 0; i < movedAssets.Length; i++)
+            {
+                PlasticAssetsProcessor.MoveOnSourceControl(
+                    movedFromAssetPaths[i],
+                    movedAssets[i]);
+            }
+
+            foreach (string deletedAsset in deletedAssets)
+            {
+                PlasticAssetsProcessor.DeleteFromSourceControl(
+                    deletedAsset);
+            }
+
+            PlasticAssetsProcessor.AddToSourceControl(importedAssets);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetsUtils/Processor/AssetPostprocessor.cs.meta b/Editor/PlasticSCM/AssetsUtils/Processor/AssetPostprocessor.cs.meta
new file mode 100644
index 0000000..ecd4f18
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/Processor/AssetPostprocessor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e9ffdef169b1cbb4e9910671a9ee83bc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/Processor/AssetsProcessor.cs b/Editor/PlasticSCM/AssetsUtils/Processor/AssetsProcessor.cs
new file mode 100644
index 0000000..82432a6
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/Processor/AssetsProcessor.cs
@@ -0,0 +1,26 @@
+using PlasticGui;
+
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+
+namespace Unity.PlasticSCM.Editor.AssetUtils.Processor
+{
+    internal static class AssetsProcessors
+    {
+        internal static void Enable(
+            IPlasticAPI plasticApi,
+            IAssetStatusCache assetStatusCache)
+        {
+            PlasticAssetsProcessor.RegisterPlasticAPI(plasticApi);
+            AssetModificationProcessor.RegisterAssetStatusCache(assetStatusCache);
+
+            AssetPostprocessor.IsEnabled = true;
+            AssetModificationProcessor.IsEnabled = true;
+        }
+
+        internal static void Disable()
+        {
+            AssetPostprocessor.IsEnabled = false;
+            AssetModificationProcessor.IsEnabled = false;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetsUtils/Processor/AssetsProcessor.cs.meta b/Editor/PlasticSCM/AssetsUtils/Processor/AssetsProcessor.cs.meta
new file mode 100644
index 0000000..c8165bc
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/Processor/AssetsProcessor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 71cb30384b5f8d64ea7df220cff88d0c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/Processor/PlasticAssetsProcessor.cs b/Editor/PlasticSCM/AssetsUtils/Processor/PlasticAssetsProcessor.cs
new file mode 100644
index 0000000..69d3173
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/Processor/PlasticAssetsProcessor.cs
@@ -0,0 +1,304 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.BaseCommands.Config;
+using Codice.Client.Commands;
+using Codice.Client.Commands.WkTree;
+using Codice.LogWrapper;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.Views.IncomingChanges;
+using Unity.PlasticSCM.Editor.Views.PendingChanges;
+
+namespace Unity.PlasticSCM.Editor.AssetUtils.Processor
+{
+    internal class PlasticAssetsProcessor
+    {
+        internal static void RegisterPlasticAPI(IPlasticAPI plasticAPI)
+        {
+            mPlasticAPI = plasticAPI;
+        }
+
+        internal static void RegisterPendingChangesView(
+            PendingChangesTab pendingChangesTab)
+        {
+            mPendingChangesTab = pendingChangesTab;
+        }
+
+        internal static void RegisterIncomingChangesView(
+            IIncomingChangesTab incomingChangesTab)
+        {
+            mIncomingChangesTab = incomingChangesTab;
+        }
+
+        internal static void UnRegisterViews()
+        {
+            mPendingChangesTab = null;
+            mIncomingChangesTab = null;
+        }
+
+        internal static void AddToSourceControl(string[] paths)
+        {
+            foreach (string path in paths)
+                mLog.DebugFormat("AddToSourceControl: {0}", path);
+
+            try
+            {
+                AddIfNotControlled(
+                    paths,
+                    mPlasticAPI);
+            }
+            catch (Exception ex)
+            {
+                LogAddException(ex);
+            }
+            finally
+            {
+                mCooldownAutorefreshAction.Ping();
+            }
+        }
+
+        internal static void DeleteFromSourceControl(string path)
+        {
+            mLog.DebugFormat("DeleteFromSourceControl: {0}", path);
+
+            try
+            {
+                string fullPath = Path.GetFullPath(path);
+
+                DeleteIfControlled(
+                    fullPath,
+                    mPlasticAPI);
+
+                DeleteIfControlled(
+                    MetaPath.GetMetaPath(fullPath),
+                    mPlasticAPI);
+            }
+            catch (Exception ex)
+            {
+                LogDeleteException(path, ex);
+            }
+            finally
+            {
+                mCooldownAutorefreshAction.Ping();
+            }
+        }
+
+        internal static void MoveOnSourceControl(string srcPath, string dstPath)
+        {
+            mLog.DebugFormat("MoveOnSourceControl: {0} to {1}", srcPath, dstPath);
+
+            try
+            {
+                string srcFullPath = Path.GetFullPath(srcPath);
+                string dstFullPath = Path.GetFullPath(dstPath);
+
+                MoveIfControlled(
+                    srcFullPath,
+                    dstFullPath,
+                    mPlasticAPI);
+
+                MoveIfControlled(
+                    MetaPath.GetMetaPath(srcFullPath),
+                    MetaPath.GetMetaPath(dstFullPath),
+                    mPlasticAPI);
+            }
+            catch (Exception ex)
+            {
+                LogMoveException(srcPath, dstPath, ex);
+            }
+            finally
+            {
+                mCooldownAutorefreshAction.Ping();
+            }
+        }
+
+        internal static void CheckoutOnSourceControl(string[] paths)
+        {
+            foreach (string path in paths)
+                mLog.DebugFormat("CheckoutOnSourceControl: {0}", path);
+
+            try
+            {
+                CheckoutIfControlledAndChanged(paths, mPlasticAPI);
+            }
+            catch (Exception ex)
+            {
+                LogCheckoutException(ex);
+            }
+            finally
+            {
+                mCooldownAutorefreshAction.Ping();
+            }
+        }
+
+        static void AddIfNotControlled(
+            string[] paths,
+            IPlasticAPI api)
+        {
+            List<string> fullPaths = new List<string>();
+
+            IgnoredFilesFilter ignoredFilter = new IgnoredFilesFilter(
+                GlobalConfig.Instance);
+
+            foreach (string path in paths)
+            {
+                string fullPath = Path.GetFullPath(path);
+                string fullPathMeta = MetaPath.GetMetaPath(fullPath);
+
+                if (api.GetWorkspaceFromPath(fullPath) == null)
+                    return;
+
+                if (api.GetWorkspaceTreeNode(fullPath) == null &&
+                    !ignoredFilter.IsIgnored(fullPath))
+                    fullPaths.Add(fullPath);
+
+                if (File.Exists(fullPathMeta) &&
+                    api.GetWorkspaceTreeNode(fullPathMeta) == null &&
+                    !ignoredFilter.IsIgnored(fullPath))
+                    fullPaths.Add(fullPathMeta);
+            }
+
+            if (fullPaths.Count == 0)
+                return;
+
+            IList checkouts;
+            api.Add(
+                fullPaths.ToArray(),
+                GetDefaultAddOptions(),
+                out checkouts);
+        }
+
+        static void DeleteIfControlled(
+            string fullPath,
+            IPlasticAPI api)
+        {
+            if (api.GetWorkspaceTreeNode(fullPath) == null)
+                return;
+
+            api.DeleteControlled(
+                fullPath,
+                DeleteModifiers.None);
+        }
+
+        static void MoveIfControlled(
+            string srcFullPath,
+            string dstFullPath,
+            IPlasticAPI api)
+        {
+            if (api.GetWorkspaceTreeNode(srcFullPath) == null)
+                return;
+
+            api.Move(
+                srcFullPath,
+                dstFullPath,
+                MoveModifiers.None);
+        }
+
+        static void CheckoutIfControlledAndChanged(string[] paths, IPlasticAPI api)
+        {
+            List<string> fullPaths = new List<string>();
+
+            foreach (string path in paths)
+            {
+                string fullPath = Path.GetFullPath(path);
+                string fullPathMeta = MetaPath.GetMetaPath(fullPath);
+
+                WorkspaceTreeNode node =
+                    api.GetWorkspaceTreeNode(fullPath);
+                WorkspaceTreeNode nodeMeta =
+                    api.GetWorkspaceTreeNode(fullPathMeta);
+
+                if (node != null && ChangedFileChecker.IsChanged(
+                    node.LocalInfo, fullPath, false))
+                    fullPaths.Add(fullPath);
+
+                if (nodeMeta != null && ChangedFileChecker.IsChanged(
+                    nodeMeta.LocalInfo, fullPathMeta, false))
+                    fullPaths.Add(fullPathMeta);
+            }
+
+            if (fullPaths.Count == 0)
+                return;
+
+            api.Checkout(
+                fullPaths.ToArray(),
+                CheckoutModifiers.None);
+        }
+
+        static void PerformAutoRefresh()
+        {
+            AutoRefresh.PendingChangesView(
+                mPendingChangesTab);
+
+            AutoRefresh.IncomingChangesView(
+                mIncomingChangesTab);
+        }
+
+        static void LogAddException(Exception ex)
+        {
+            UnityEngine.Debug.LogWarning(
+                string.Format(PlasticLocalization.GetString(PlasticLocalization.Name.CannotAddVersionControl),
+                ex.Message));
+
+            LogException(ex);
+        }
+
+        static void LogDeleteException(string path, Exception ex)
+        {
+            UnityEngine.Debug.LogWarning(
+                string.Format(PlasticLocalization.GetString(PlasticLocalization.Name.CannotDeleteVersionControl),
+                path, ex.Message));
+
+            LogException(ex);
+        }
+
+        static void LogMoveException(string srcPath, string dstPath, Exception ex)
+        {
+            UnityEngine.Debug.LogWarning(
+                string.Format(PlasticLocalization.GetString(PlasticLocalization.Name.CannotMoveVersionControl),
+                srcPath, dstPath, ex.Message));
+
+            LogException(ex);
+        }
+
+        static void LogCheckoutException(Exception ex)
+        {
+            UnityEngine.Debug.LogWarning(
+                string.Format(PlasticLocalization.GetString(PlasticLocalization.Name.CannotCheckoutVersionControl),
+                ex.Message));
+
+            LogException(ex);
+        }
+
+        static void LogException(Exception ex)
+        {
+            mLog.WarnFormat("Message: {0}", ex.Message);
+
+            mLog.DebugFormat(
+                "StackTrace:{0}{1}",
+                Environment.NewLine, ex.StackTrace);
+        }
+
+        static AddOptions GetDefaultAddOptions()
+        {
+            AddOptions options = new AddOptions();
+            options.AddPrivateParents = true;
+            options.NeedCheckPlatformPath = true;
+            return options;
+        }
+
+        static volatile IPlasticAPI mPlasticAPI;
+
+        static PendingChangesTab mPendingChangesTab;
+        static IIncomingChangesTab mIncomingChangesTab;
+
+        static CooldownWindowDelayer mCooldownAutorefreshAction = new CooldownWindowDelayer(
+            PerformAutoRefresh, UnityConstants.AUTO_REFRESH_DELAYED_INTERVAL);
+
+        static readonly ILog mLog = LogManager.GetLogger("PlasticAssetsProcessor");
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/AssetsUtils/Processor/PlasticAssetsProcessor.cs.meta b/Editor/PlasticSCM/AssetsUtils/Processor/PlasticAssetsProcessor.cs.meta
new file mode 100644
index 0000000..9f7c491
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/Processor/PlasticAssetsProcessor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d3daa94b5fca9a648b12f6ef2aae752f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/ProjectPath.cs b/Editor/PlasticSCM/AssetsUtils/ProjectPath.cs
new file mode 100644
index 0000000..df091a3
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/ProjectPath.cs
@@ -0,0 +1,12 @@
+using System.IO;
+
+namespace Unity.PlasticSCM.Editor.AssetUtils
+{
+    internal static class ProjectPath
+    {
+        internal static string FromApplicationDataPath(string dataPath)
+        {
+            return Path.GetDirectoryName(Path.GetFullPath(dataPath));
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetsUtils/ProjectPath.cs.meta b/Editor/PlasticSCM/AssetsUtils/ProjectPath.cs.meta
new file mode 100644
index 0000000..e334442
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/ProjectPath.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6cad902920d2d0e448b4a307b199d8fd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/RefreshAsset.cs b/Editor/PlasticSCM/AssetsUtils/RefreshAsset.cs
new file mode 100644
index 0000000..3397d44
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/RefreshAsset.cs
@@ -0,0 +1,29 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.AssetUtils
+{
+    internal static class RefreshAsset
+    {
+        internal static void UnityAssetDatabase()
+        {
+            AssetDatabase.Refresh(ImportAssetOptions.Default);
+            VersionControlCache();
+        }
+
+        internal static void VersionControlCache()
+        {
+            UnityEditor.VersionControl.Provider.ClearCache();
+            RepaintInspectors();
+        }
+
+        internal static void RepaintInspectors()
+        {
+            UnityEditor.Editor[] editors =
+                Resources.FindObjectsOfTypeAll<UnityEditor.Editor>();
+
+            foreach (UnityEditor.Editor editor in editors)
+                editor.Repaint();
+         }
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/AssetsUtils/RefreshAsset.cs.meta b/Editor/PlasticSCM/AssetsUtils/RefreshAsset.cs.meta
new file mode 100644
index 0000000..ddf8983
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/RefreshAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7495e44f1cb132745a310485807e68f6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AssetsUtils/SaveAssets.cs b/Editor/PlasticSCM/AssetsUtils/SaveAssets.cs
new file mode 100644
index 0000000..ce34b07
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/SaveAssets.cs
@@ -0,0 +1,137 @@
+using System.IO;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine.SceneManagement;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Common;
+
+namespace Unity.PlasticSCM.Editor.AssetUtils
+{
+    internal static class SaveAssets
+    {
+        internal static void ForChangesWithConfirmation(
+            List<ChangeInfo> changes,
+            out bool isCancelled)
+        {
+            ForPaths(
+                GetPaths(changes), true,
+                out isCancelled);
+        }
+
+        internal static void ForPathsWithConfirmation(
+            List<string> paths,
+            out bool isCancelled)
+        {
+            ForPaths(
+                paths, true,
+                out isCancelled);
+        }
+
+        internal static void ForChangesWithoutConfirmation(
+            List<ChangeInfo> changes)
+        {
+            bool isCancelled;
+            ForPaths(
+                GetPaths(changes), false,
+                out isCancelled);
+        }
+
+        internal static void ForPathsWithoutConfirmation(
+            List<string> paths)
+        {
+            bool isCancelled;
+            ForPaths(
+                paths, false,
+                out isCancelled);
+        }
+
+        static void ForPaths(
+            List<string> paths,
+            bool askForUserConfirmation,
+            out bool isCancelled)
+        {
+            SaveDirtyScenes(
+                paths,
+                askForUserConfirmation,
+                out isCancelled);
+
+            if (isCancelled)
+                return;
+
+            AssetDatabase.SaveAssets();
+        }
+
+        static void SaveDirtyScenes(
+            List<string> paths,
+            bool askForUserConfirmation,
+            out bool isCancelled)
+        {
+            isCancelled = false;
+
+            List<Scene> scenesToSave = new List<Scene>();
+
+            foreach (Scene dirtyScene in GetDirtyScenes())
+            {
+                if (Contains(paths, dirtyScene))
+                    scenesToSave.Add(dirtyScene);
+            }
+
+            if (scenesToSave.Count == 0)
+                return;
+
+            if (askForUserConfirmation)
+            {
+                isCancelled = !EditorSceneManager.
+                    SaveModifiedScenesIfUserWantsTo(
+                        scenesToSave.ToArray());
+                return;
+            }
+
+            EditorSceneManager.SaveScenes(
+                scenesToSave.ToArray());
+        }
+
+        static List<Scene> GetDirtyScenes()
+        {
+            List<Scene> dirtyScenes = new List<Scene>();
+
+            for (int i = 0; i < SceneManager.sceneCount; i++)
+            {
+                Scene scene = SceneManager.GetSceneAt(i);
+
+                if (!scene.isDirty)
+                    continue;
+
+                dirtyScenes.Add(scene);
+            }
+
+            return dirtyScenes;
+        }
+
+        static bool Contains(
+            List<string> paths,
+            Scene scene)
+        {
+            foreach (string path in paths)
+            {
+                if (PathHelper.IsSamePath(
+                        path,
+                        Path.GetFullPath(scene.path)))
+                    return true;
+            }
+
+            return false;
+        }
+
+        static List<string> GetPaths(List<ChangeInfo> changeInfos)
+        {
+            List<string> result = new List<string>();
+            foreach (ChangeInfo change in changeInfos)
+                result.Add(change.GetFullPath());
+            return result;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AssetsUtils/SaveAssets.cs.meta b/Editor/PlasticSCM/AssetsUtils/SaveAssets.cs.meta
new file mode 100644
index 0000000..c8072e0
--- /dev/null
+++ b/Editor/PlasticSCM/AssetsUtils/SaveAssets.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 802adf99bdbb1a3439a0a09ae5664192
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/AutoRefresh.cs b/Editor/PlasticSCM/AutoRefresh.cs
new file mode 100644
index 0000000..efc6e50
--- /dev/null
+++ b/Editor/PlasticSCM/AutoRefresh.cs
@@ -0,0 +1,27 @@
+using Unity.PlasticSCM.Editor.Views.IncomingChanges;
+using Unity.PlasticSCM.Editor.Views.PendingChanges;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class AutoRefresh
+    {
+        internal static void PendingChangesView(PendingChangesTab pendingChangesTab)
+        {
+            if (pendingChangesTab == null)
+                return;
+
+            pendingChangesTab.AutoRefresh();
+        }
+
+        internal static void IncomingChangesView(IIncomingChangesTab incomingChangesTab)
+        {
+            if (incomingChangesTab == null)
+                return;
+
+            if (!incomingChangesTab.IsVisible)
+                return;
+
+            incomingChangesTab.AutoRefresh();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/AutoRefresh.cs.meta b/Editor/PlasticSCM/AutoRefresh.cs.meta
new file mode 100644
index 0000000..e077d45
--- /dev/null
+++ b/Editor/PlasticSCM/AutoRefresh.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a840d4787ba856c4dbaf61207189b00c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Beta.meta b/Editor/PlasticSCM/Beta.meta
new file mode 100644
index 0000000..b808896
--- /dev/null
+++ b/Editor/PlasticSCM/Beta.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b5ce4856fff3e004d9d5cd46e77f7e91
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Beta/CalculateUserBetaProgramSetting.cs b/Editor/PlasticSCM/Beta/CalculateUserBetaProgramSetting.cs
new file mode 100644
index 0000000..8019b58
--- /dev/null
+++ b/Editor/PlasticSCM/Beta/CalculateUserBetaProgramSetting.cs
@@ -0,0 +1,103 @@
+using System;
+
+using UnityEditor;
+
+using Codice.Client.Common.Threading;
+using Codice.Client.Common.WebApi;
+using Codice.LogWrapper;
+using Unity.PlasticSCM.Editor.WebApi;
+
+namespace Unity.PlasticSCM.Editor.Beta
+{
+    [InitializeOnLoad]
+    internal static class CalculateUserBetaProgramSetting
+    {
+        static CalculateUserBetaProgramSetting()
+        {
+            EditorApplication.update += RunOnceWhenAccessTokenIsInitialized;
+        }
+
+        static void RunOnceWhenAccessTokenIsInitialized()
+        {
+            if (string.IsNullOrEmpty(CloudProjectSettings.accessToken))
+                return;
+
+            EditorApplication.update -= RunOnceWhenAccessTokenIsInitialized;
+
+            if (CollabPlugin.IsEnabled())
+                return;
+
+            Execute(CloudProjectSettings.accessToken);
+        }
+
+        static void Execute(string unityAccessToken)
+        {
+            if (SessionState.GetBool(
+                    IS_USER_BETA_PROGRAM_ALREADY_CALCULATED_KEY, false))
+            {
+                return;
+            }
+
+            SessionState.SetBool(
+                IS_USER_BETA_PROGRAM_ALREADY_CALCULATED_KEY, true);
+
+            PlasticApp.InitializeIfNeeded();
+
+            EnableUserBetaProgramIfNeeded(unityAccessToken);
+        }
+
+        static void EnableUserBetaProgramIfNeeded(string unityAccessToken)
+        {
+            int ini = Environment.TickCount;
+
+            UnityPackageBetaEnrollResponse response = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+            /*threadOperationDelegate*/ delegate
+            {
+                response = PlasticScmRestApiClient.IsBetaEnabled(unityAccessToken);
+            },
+            /*afterOperationDelegate*/ delegate
+            {
+                mLog.DebugFormat(
+                    "IsBetaEnabled time {0} ms",
+                    Environment.TickCount - ini);
+
+                if (waiter.Exception != null)
+                {
+                    ExceptionsHandler.LogException(
+                        "CalculateUserBetaProgramSetting",
+                        waiter.Exception);
+                    return;
+                }
+
+                if (response == null)
+                    return;
+
+                if (response.Error != null)
+                {
+                    mLog.ErrorFormat(
+                        "Unable to retrieve is beta enabled: {0} [code {1}]",
+                        response.Error.Message, response.Error.ErrorCode);
+                    return;
+                }
+
+                if (!response.IsBetaEnabled)
+                {
+                    mLog.InfoFormat(
+                        "Beta is disabled for accessToken: {0}",
+                        unityAccessToken);
+                    return;
+                }
+
+                PlasticMenuItem.Add();
+            });
+    }
+
+        const string IS_USER_BETA_PROGRAM_ALREADY_CALCULATED_KEY =
+            "PlasticSCM.UserBetaProgram.IsAlreadyCalculated";
+
+        static readonly ILog mLog = LogManager.GetLogger("CalculateUserBetaProgramSetting");
+    }
+}
diff --git a/Editor/PlasticSCM/Beta/CalculateUserBetaProgramSetting.cs.meta b/Editor/PlasticSCM/Beta/CalculateUserBetaProgramSetting.cs.meta
new file mode 100644
index 0000000..001f3de
--- /dev/null
+++ b/Editor/PlasticSCM/Beta/CalculateUserBetaProgramSetting.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7b5b02b72be11d248a012a4b71e66166
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/CheckWorkspaceTreeNodeStatus.cs b/Editor/PlasticSCM/CheckWorkspaceTreeNodeStatus.cs
new file mode 100644
index 0000000..f229f34
--- /dev/null
+++ b/Editor/PlasticSCM/CheckWorkspaceTreeNodeStatus.cs
@@ -0,0 +1,35 @@
+using Codice.Client.Commands.WkTree;
+using Codice.CM.Common;
+
+namespace Codice
+{
+    internal static class CheckWorkspaceTreeNodeStatus
+    {
+        internal static bool IsPrivate(WorkspaceTreeNode node)
+        {
+            return node == null;
+        }
+
+        internal static bool IsCheckedOut(WorkspaceTreeNode node)
+        {
+            if (node == null)
+                return false;
+
+            return node.RevInfo.CheckedOut;
+        }
+
+        internal static bool IsAdded(WorkspaceTreeNode node)
+        {
+            if (node == null)
+                return false;
+
+            return node.RevInfo.CheckedOut &&
+                   node.RevInfo.ParentId == -1;
+        }
+
+        internal static bool IsDirectory(WorkspaceTreeNode node)
+        {
+            return node.RevInfo.Type == EnumRevisionType.enDirectory;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/CheckWorkspaceTreeNodeStatus.cs.meta b/Editor/PlasticSCM/CheckWorkspaceTreeNodeStatus.cs.meta
new file mode 100644
index 0000000..3327a88
--- /dev/null
+++ b/Editor/PlasticSCM/CheckWorkspaceTreeNodeStatus.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f6aa8eca9e9e84840b73620eb177ea9e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/CloudProjectDownloader.meta b/Editor/PlasticSCM/CloudProjectDownloader.meta
new file mode 100644
index 0000000..645432c
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2a088652feef3704ab1221770deb738a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/AutoConfigClientConf.cs b/Editor/PlasticSCM/CloudProjectDownloader/AutoConfigClientConf.cs
new file mode 100644
index 0000000..cbb35b5
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/AutoConfigClientConf.cs
@@ -0,0 +1,68 @@
+using Codice.Client.Common;
+using Codice.Client.Common.WebApi;
+using Codice.CM.Common;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.WebApi;
+
+namespace Unity.PlasticSCM.Editor.ProjectDownloader
+{
+    internal static class AutoConfigClientConf
+    {
+        internal static void FromUnityAccessToken(
+            string unityAccessToken,
+            RepositorySpec repSpec,
+            string projectPath)
+        {
+            CredentialsResponse response =
+                PlasticScmRestApiClient.GetCredentials(unityAccessToken);
+
+            if (response.Error != null)
+            {
+                UnityEngine.Debug.LogErrorFormat(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ErrorGettingCredentialsCloudProject),
+                    response.Error.Message,
+                    response.Error.ErrorCode);
+
+                return;
+            }
+
+            ClientConfigData configData = BuildClientConfigData(
+                repSpec,
+                projectPath,
+                response);
+
+            ClientConfig.Get().Save(configData);
+        }
+
+        static ClientConfigData BuildClientConfigData(
+            RepositorySpec repSpec,
+            string projectPath,
+            CredentialsResponse response)
+        {
+            SEIDWorkingMode workingMode = SEIDWorkingMode.LDAPWorkingMode;
+
+            ClientConfigData configData = new ClientConfigData();
+
+            configData.WorkspaceServer = repSpec.Server;
+            configData.CurrentWorkspace = projectPath;
+            configData.WorkingMode = workingMode.ToString();
+            configData.SecurityConfig = UserInfo.GetSecurityConfigStr(
+                workingMode,
+                response.Email,
+                GetPassword(response.Token, response.Type));
+            return configData;
+        }
+
+        static string GetPassword(
+            string token,
+            CredentialsResponse.TokenType tokenType)
+        {
+            if (tokenType == CredentialsResponse.TokenType.Bearer)
+                return BEARER_PREFIX + token;
+
+            return token;
+        }
+
+        const string BEARER_PREFIX = "Bearer ";
+    }
+}
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/AutoConfigClientConf.cs.meta b/Editor/PlasticSCM/CloudProjectDownloader/AutoConfigClientConf.cs.meta
new file mode 100644
index 0000000..c358b22
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/AutoConfigClientConf.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7c21251ff4b7d844292a388e81e47e59
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/CloudProjectDownloader.cs b/Editor/PlasticSCM/CloudProjectDownloader/CloudProjectDownloader.cs
new file mode 100644
index 0000000..86a2c2c
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/CloudProjectDownloader.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.LogWrapper;
+
+namespace Unity.PlasticSCM.Editor.ProjectDownloader
+{
+    [InitializeOnLoad]
+    internal static class CloudProjectDownloader
+    {
+        static CloudProjectDownloader()
+        {
+            EditorApplication.update += RunOnceWhenAccessTokenIsInitialized;
+        }
+
+        static void RunOnceWhenAccessTokenIsInitialized()
+        {
+            if (string.IsNullOrEmpty(CloudProjectSettings.accessToken))
+                return;
+
+            EditorApplication.update -= RunOnceWhenAccessTokenIsInitialized;
+
+            Execute(CloudProjectSettings.accessToken);
+        }
+
+        static void Execute(string unityAccessToken)
+        {
+            if (SessionState.GetBool(
+                    IS_PROJECT_DOWNLOADER_ALREADY_EXECUTED_KEY, false))
+            {
+                return;
+            }
+
+            SessionState.SetBool(
+                IS_PROJECT_DOWNLOADER_ALREADY_EXECUTED_KEY, true);
+
+            DownloadRepository(unityAccessToken);
+        }
+
+        static void DownloadRepository(string unityAccessToken)
+        {
+            Dictionary<string, string> args = CommandLineArguments.Build(
+                Environment.GetCommandLineArgs());
+
+            mLog.DebugFormat(
+                "Processing Unity arguments: {0}",
+                string.Join(" ", Environment.GetCommandLineArgs()));
+
+            string projectPath = ParseArguments.ProjectPath(args);
+            string cloudRepository = ParseArguments.CloudProject(args);
+            string cloudOrganization = ParseArguments.CloudOrganization(args);
+
+            if (string.IsNullOrEmpty(projectPath) ||
+                string.IsNullOrEmpty(cloudRepository) ||
+                string.IsNullOrEmpty(cloudOrganization))
+                return;
+
+            PlasticApp.InitializeIfNeeded();
+
+            DownloadRepositoryOperation downloadOperation =
+                new DownloadRepositoryOperation();
+
+            downloadOperation.DownloadRepositoryToPathIfNeeded(
+                cloudRepository,
+                cloudOrganization,
+                Path.GetFullPath(projectPath),
+                unityAccessToken);
+        }
+
+        const string IS_PROJECT_DOWNLOADER_ALREADY_EXECUTED_KEY =
+            "PlasticSCM.ProjectDownloader.IsAlreadyExecuted";
+
+        static readonly ILog mLog = LogManager.GetLogger("ProjectDownloader");
+    }
+}
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/CloudProjectDownloader.cs.meta b/Editor/PlasticSCM/CloudProjectDownloader/CloudProjectDownloader.cs.meta
new file mode 100644
index 0000000..4044f6b
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/CloudProjectDownloader.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 94a5d27698bed3d42beabebcedbf1f23
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/CommandLineArguments.cs b/Editor/PlasticSCM/CloudProjectDownloader/CommandLineArguments.cs
new file mode 100644
index 0000000..1b3a9b6
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/CommandLineArguments.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.PlasticSCM.Editor.ProjectDownloader
+{
+    internal class CommandLineArguments
+    {
+        internal static Dictionary<string, string> Build(string[] args)
+        {
+            Dictionary<string, string> result = new Dictionary<string, string>(
+                StringComparer.OrdinalIgnoreCase);
+
+            if (args == null)
+                return result;
+            List<string> trimmedArguments = TrimArgs(args);
+
+            int index = 1;
+
+            while (true)
+            {
+                if (index > trimmedArguments.Count - 1)
+                    break;
+
+                if (IsKeyValueArgumentAtIndex(trimmedArguments, index))
+                {
+                    result[trimmedArguments[index]] = trimmedArguments[index + 1];
+                    index += 2;
+                    continue;
+                }
+
+                result[trimmedArguments[index]] = null;
+                index += 1;
+            }
+
+            return result;
+        }
+
+        static List<string> TrimArgs(string[] args)
+        {
+            List<string> trimmedArguments = new List<string>();
+
+            foreach (string argument in args)
+                trimmedArguments.Add(argument.Trim());
+
+            return trimmedArguments;
+        }
+
+        static bool IsKeyValueArgumentAtIndex(
+            List<string> trimmedArguments,
+            int index)
+        {
+            if (index + 1 > trimmedArguments.Count -1)
+                return false;
+
+            return !trimmedArguments[index + 1].StartsWith("-");
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/CommandLineArguments.cs.meta b/Editor/PlasticSCM/CloudProjectDownloader/CommandLineArguments.cs.meta
new file mode 100644
index 0000000..f9e83f2
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/CommandLineArguments.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4675673a75b20a14da0806d155b5680c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/DownloadRepositoryOperation.cs b/Editor/PlasticSCM/CloudProjectDownloader/DownloadRepositoryOperation.cs
new file mode 100644
index 0000000..6cd4791
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/DownloadRepositoryOperation.cs
@@ -0,0 +1,221 @@
+using System;
+using System.IO;
+using System.Threading;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using Codice.Client.Common;
+using Codice.CM.Common;
+using Codice.LogWrapper;
+using Codice.Utils;
+using PlasticGui;
+using PlasticGui.WebApi;
+using PlasticGui.WorkspaceWindow;
+using PlasticGui.WorkspaceWindow.Update;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.Tool;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.ProjectDownloader
+{
+    internal class DownloadRepositoryOperation
+    {
+        internal void DownloadRepositoryToPathIfNeeded(
+            string cloudRepository,
+            string cloudOrganization,
+            string projectPath,
+            string unityAccessToken)
+        {
+            AssetDatabase.DisallowAutoRefresh();
+
+            try
+            {
+                BuildProgressSpeedAndRemainingTime.ProgressData progressData =
+                    new BuildProgressSpeedAndRemainingTime.ProgressData(DateTime.Now);
+
+                ThreadPool.QueueUserWorkItem(
+                    DownloadRepository,
+                    new DownloadRepositoryParameters()
+                    {
+                        CloudOrganization = cloudOrganization,
+                        CloudRepository = cloudRepository,
+                        ProjectPath = projectPath,
+                        AccessToken = unityAccessToken
+                    });
+
+                while (!mOperationFinished)
+                {
+                    if (mDisplayProgress)
+                    {
+                        DisplayProgress(
+                            mUpdateNotifier.GetUpdateStatus(),
+                            progressData,
+                            cloudRepository);
+                    }
+
+                    Thread.Sleep(150);
+                }
+            }
+            finally
+            {
+                EditorUtility.ClearProgressBar();
+
+                AssetDatabase.AllowAutoRefresh();
+
+                RefreshAsset.UnityAssetDatabase();
+
+                if (!mOperationFailed)
+                {
+                    ShowWindow.PlasticAfterDownloadingProject();
+                }
+            }
+        }
+
+        void DownloadRepository(object state)
+        {
+            DownloadRepositoryParameters parameters = (DownloadRepositoryParameters)state;
+
+            try
+            {
+                IPlasticWebRestApi restApi = new PlasticWebRestApi();
+                string defaultCloudAlias = restApi.GetDefaultCloudAlias();
+
+                RepositorySpec repSpec = BuildRepSpec(
+                    parameters.CloudRepository,
+                    parameters.CloudOrganization,
+                    defaultCloudAlias);
+
+                // we just download a cloud project,
+                // so let's assume we're going to use Cloud Edition
+                SetupUnityEditionToken.CreateCloudEditionTokenIfNeeded();
+
+                if (!ClientConfig.IsConfigured())
+                {
+                    AutoConfigClientConf.FromUnityAccessToken(
+                        parameters.AccessToken,
+                        repSpec,
+                        parameters.ProjectPath);
+                }
+
+                if (WorkspaceExists(parameters.ProjectPath))
+                {
+                    // each domain reload, the package is reloaded.
+                    // way need to check if we already downloaded it
+                    return;
+                }
+
+                mDisplayProgress = true;
+
+                WorkspaceInfo wkInfo = CreateWorkspace(
+                    repSpec, parameters.ProjectPath);
+
+                mLog.DebugFormat("Created workspace {0} on {1}",
+                    wkInfo.Name,
+                    wkInfo.ClientPath);
+
+                Plastic.API.Update(
+                    wkInfo.ClientPath,
+                    UpdateFlags.None,
+                    null,
+                    mUpdateNotifier);
+            }
+            catch (Exception ex)
+            {
+                LogException(ex);
+
+                UnityEngine.Debug.LogErrorFormat(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ErrorDownloadingCloudProject),
+                    ex.Message);
+
+                mOperationFailed = true;
+            }
+            finally
+            {
+                mOperationFinished = true;
+            }
+        }
+
+        static void DisplayProgress(
+            UpdateOperationStatus status,
+            BuildProgressSpeedAndRemainingTime.ProgressData progressData,
+            string cloudRepository)
+        {
+            string totalProgressMessage = UpdateProgressRender.
+                GetProgressString(status, progressData);
+
+            float totalProgressPercent = GetProgressBarPercent.
+                ForTransfer(status.UpdatedSize, status.TotalSize) / 100f;
+
+            EditorUtility.DisplayProgressBar(
+                string.Format("{0} {1}",
+                    PlasticLocalization.GetString(PlasticLocalization.Name.DownloadingProgress),
+                    cloudRepository),
+                totalProgressMessage, totalProgressPercent);
+        }
+
+        static WorkspaceInfo CreateWorkspace(
+            RepositorySpec repositorySpec,
+            string projectPath)
+        {
+            CreateWorkspaceDialogUserAssistant assistant = new CreateWorkspaceDialogUserAssistant(
+                PlasticGuiConfig.Get().Configuration.DefaultWorkspaceRoot,
+                Plastic.API.GetAllWorkspacesArray());
+
+            assistant.RepositoryChanged(
+                repositorySpec.ToString(),
+                string.Empty,
+                string.Empty);
+
+            return Plastic.API.CreateWorkspace(
+                projectPath,
+                assistant.GetProposedWorkspaceName(),
+                repositorySpec.ToString());
+        }
+
+        static RepositorySpec BuildRepSpec(
+            string cloudRepository,
+            string cloudOrganization,
+            string defaultCloudAlias)
+        {
+            return new RepositorySpec()
+            {
+                Name = cloudRepository,
+                Server = CloudServer.BuildFullyQualifiedName(
+                    cloudOrganization, defaultCloudAlias)
+            };
+        }
+
+        static void LogException(Exception ex)
+        {
+            mLog.WarnFormat("Message: {0}", ex.Message);
+
+            mLog.DebugFormat(
+                "StackTrace:{0}{1}",
+                Environment.NewLine, ex.StackTrace);
+        }
+
+        static bool WorkspaceExists(string projectPath)
+        {
+            return Plastic.API.GetWorkspaceFromPath(projectPath) != null;
+        }
+
+        class DownloadRepositoryParameters
+        {
+            internal string CloudRepository;
+            internal string CloudOrganization;
+            internal string ProjectPath;
+            internal string AccessToken;
+        }
+
+        volatile bool mOperationFinished = false;
+        volatile bool mOperationFailed = false;
+        volatile bool mDisplayProgress;
+
+        UpdateNotifier mUpdateNotifier = new UpdateNotifier();
+
+        static readonly ILog mLog = LogManager.GetLogger("DownloadRepositoryOperation");
+    }
+}
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/DownloadRepositoryOperation.cs.meta b/Editor/PlasticSCM/CloudProjectDownloader/DownloadRepositoryOperation.cs.meta
new file mode 100644
index 0000000..e4e4a75
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/DownloadRepositoryOperation.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 608efd4e185fb9440bb8550d98e20ca4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/ParseArguments.cs b/Editor/PlasticSCM/CloudProjectDownloader/ParseArguments.cs
new file mode 100644
index 0000000..b84bb61
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/ParseArguments.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+
+namespace Unity.PlasticSCM.Editor.ProjectDownloader
+{
+    internal static class ParseArguments
+    {
+        internal static string CloudProject(Dictionary<string, string> args)
+        {
+            string data;
+
+            if (!args.TryGetValue(CLOUD_PROJECT, out data))
+                return null;
+
+            return data;
+        }
+
+        internal static string CloudOrganization(Dictionary<string, string> args)
+        {
+            string data;
+
+            if (!args.TryGetValue(CLOUD_ORGANIZATION, out data))
+                return null;
+
+            return GetOrganizationNameFromData(data);
+        }
+
+        internal static string ProjectPath(Dictionary<string, string> args)
+        {
+            string data;
+
+            if (!args.TryGetValue(CREATE_PROJECT, out data))
+                return null;
+
+            return data;
+        }
+
+        static string GetOrganizationNameFromData(string data)
+        {
+            // data is in format: 151d73c7-38cb-4eec-b11e-34764e707226-danipen-unity
+            int guidLenght = 36;
+
+            if (data.Length < guidLenght + 1)
+                return null;
+
+            return data.Substring(guidLenght + 1);
+        }
+
+        const string CLOUD_PROJECT = "-cloudProject";
+        const string CLOUD_ORGANIZATION = "-cloudOrganization";
+        const string CREATE_PROJECT = "-createProject";
+
+    }
+}
diff --git a/Editor/PlasticSCM/CloudProjectDownloader/ParseArguments.cs.meta b/Editor/PlasticSCM/CloudProjectDownloader/ParseArguments.cs.meta
new file mode 100644
index 0000000..ba74f2b
--- /dev/null
+++ b/Editor/PlasticSCM/CloudProjectDownloader/ParseArguments.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f6b5d170f39144847822c10b478f25e5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/CollabPlugin.cs b/Editor/PlasticSCM/CollabPlugin.cs
new file mode 100644
index 0000000..147737e
--- /dev/null
+++ b/Editor/PlasticSCM/CollabPlugin.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Reflection;
+
+using UnityEditor;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class CollabPlugin
+    {
+        internal static bool IsEnabled()
+        {
+            return IsCollabInstanceEnabled();
+        }
+
+        internal static void Disable()
+        {
+            DisableCollabInstance();
+
+            DisableCollabInProjectSettings();
+        }
+
+        static void DisableCollabInstance()
+        {
+            object collabInstance = GetCollabInstance();
+
+            if (collabInstance == null)
+                return;
+
+            // Invokes Collab.instance.SetCollabEnabledForCurrentProject(false)
+            SetCollabEnabledForCurrentProject(collabInstance, false);
+        }
+
+        static void DisableCollabInProjectSettings()
+        {
+            // Invokes PlayerSettings.SetCloudServiceEnabled("Collab", false)
+            SetCloudServiceEnabled("Collab", false);
+
+            AssetDatabase.SaveAssets();
+        }
+
+        static bool IsCollabInstanceEnabled()
+        {
+            object collabInstance = GetCollabInstance();
+
+            if (collabInstance == null)
+                return false;
+
+            // Invokes Collab.instance.IsCollabEnabledForCurrentProject()
+            return IsCollabEnabledForCurrentProject(collabInstance);
+        }
+
+        static void SetCollabEnabledForCurrentProject(object collabInstance, bool enable)
+        {
+            MethodInfo InternalSetCollabEnabledForCurrentProject =
+                CollabType.GetMethod("SetCollabEnabledForCurrentProject");
+
+            if (InternalSetCollabEnabledForCurrentProject == null)
+                return;
+
+            InternalSetCollabEnabledForCurrentProject.
+                Invoke(collabInstance, new object[] { enable });
+        }
+
+        static void SetCloudServiceEnabled(string setting, bool enable)
+        {
+            MethodInfo InternalSetCloudServiceEnabled = PlayerSettingsType.GetMethod(
+               "SetCloudServiceEnabled",
+               BindingFlags.NonPublic | BindingFlags.Static);
+
+            if (InternalSetCloudServiceEnabled == null)
+                return;
+
+            InternalSetCloudServiceEnabled.
+                Invoke(null, new object[] { setting, enable });
+        }
+
+        static object GetCollabInstance()
+        {
+            if (CollabType == null)
+                return null;
+
+            PropertyInfo InternalInstance =
+                CollabType.GetProperty("instance");
+
+            if (InternalInstance == null)
+                return null;
+
+            return InternalInstance.GetValue(null, null);
+        }
+
+        static bool IsCollabEnabledForCurrentProject(object collabInstance)
+        {
+            MethodInfo InternalIsCollabEnabledForCurrentProject =
+                CollabType.GetMethod("IsCollabEnabledForCurrentProject");
+
+            if (InternalIsCollabEnabledForCurrentProject == null)
+                return false;
+
+            return (bool)InternalIsCollabEnabledForCurrentProject.
+                Invoke(collabInstance, null);
+        }
+
+        static readonly Type CollabType =
+            typeof(UnityEditor.Editor).Assembly.
+                GetType("UnityEditor.Collaboration.Collab");
+
+        static readonly Type PlayerSettingsType =
+            typeof(UnityEditor.PlayerSettings);
+    }
+}
diff --git a/Editor/PlasticSCM/CollabPlugin.cs.meta b/Editor/PlasticSCM/CollabPlugin.cs.meta
new file mode 100644
index 0000000..3722406
--- /dev/null
+++ b/Editor/PlasticSCM/CollabPlugin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8b1d1407c22e5844698f18df6a9f1781
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration.meta b/Editor/PlasticSCM/Configuration.meta
new file mode 100644
index 0000000..2df003c
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec63ff75b0076d64fb0a5cf58170501f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/ChannelCertificateUiImpl.cs b/Editor/PlasticSCM/Configuration/ChannelCertificateUiImpl.cs
new file mode 100644
index 0000000..71849fe
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/ChannelCertificateUiImpl.cs
@@ -0,0 +1,93 @@
+using Codice.Client.Common;
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticPipe.Certificates;
+using Unity.PlasticSCM.Editor.UI;
+using UnityEditor;
+
+namespace Unity.PlasticSCM.Editor.Configuration
+{
+    internal class ChannelCertificateUiImpl : IChannelCertificateUI
+    {
+        internal ChannelCertificateUiImpl()
+        {
+        }
+
+        CertOperationResult IChannelCertificateUI.AcceptNewServerCertificate(PlasticCertInfo serverCertificate)
+        {
+            return GetUserResponse(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.NewCertificateTitle),
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.NewCertificateMessage),
+                serverCertificate);
+        }
+
+        CertOperationResult IChannelCertificateUI.AcceptChangedServerCertificate(PlasticCertInfo serverCertificate)
+        {
+            return GetUserResponse(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.ExistingCertificateChangedTitle),
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.ExistingCertificateChangedMessage),
+                serverCertificate);
+        }
+
+        bool IChannelCertificateUI.AcceptInvalidHostname(string certHostname, string serverHostname)
+        {
+            bool result = false;
+
+            GUIActionRunner.RunGUIAction(delegate {
+                result = EditorUtility.DisplayDialog(
+                    PlasticLocalization.GetString(
+                        PlasticLocalization.Name.InvalidCertificateHostnameTitle),
+                    PlasticLocalization.GetString(
+                        PlasticLocalization.Name.InvalidCertificateHostnameMessage,
+                        certHostname, serverHostname),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.YesButton),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.NoButton));
+            });
+
+            return result;
+        }
+
+        CertOperationResult GetUserResponse(
+            string title, string message, PlasticCertInfo serverCertificate)
+        {
+            GuiMessage.GuiMessageResponseButton result =
+                GuiMessage.GuiMessageResponseButton.Third;
+
+            GUIActionRunner.RunGUIAction(delegate {
+                result = GuiMessage.ShowQuestion(
+                    title, GetCertificateMessageString(message, serverCertificate),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.YesButton),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.NoButton),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.CancelButton),
+                    true);
+            });
+
+            switch (result)
+            {
+                case GuiMessage.GuiMessageResponseButton.First:
+                    return CertOperationResult.AddToStore;
+                case GuiMessage.GuiMessageResponseButton.Second:
+                    return CertOperationResult.DoNotAddToStore;
+                case GuiMessage.GuiMessageResponseButton.Third:
+                    return CertOperationResult.Cancel;
+                default:
+                    return CertOperationResult.Cancel;
+            }
+        }
+
+        string GetCertificateMessageString(string message, PlasticCertInfo serverCertificate)
+        {
+            return string.Format(message,
+                CertificateUi.GetCnField(serverCertificate.Subject),
+                CertificateUi.GetCnField(serverCertificate.Issuer),
+                serverCertificate.Format,
+                serverCertificate.ExpirationDateString,
+                serverCertificate.KeyAlgorithm,
+                serverCertificate.CertHashString);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Configuration/ChannelCertificateUiImpl.cs.meta b/Editor/PlasticSCM/Configuration/ChannelCertificateUiImpl.cs.meta
new file mode 100644
index 0000000..dbcf2c5
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/ChannelCertificateUiImpl.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 628bc1ed591aa164ab9124ac22e02d9a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition.meta b/Editor/PlasticSCM/Configuration/CloudEdition.meta
new file mode 100644
index 0000000..9cffe8f
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b593e05bcd27824eb229f8c6b20e13b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome.meta b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome.meta
new file mode 100644
index 0000000..c3448ba
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 86d9084a265d35f4db65c4e31e0b6769
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CloudEditionWelcomeWindow.cs b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CloudEditionWelcomeWindow.cs
new file mode 100644
index 0000000..4e2ea2f
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CloudEditionWelcomeWindow.cs
@@ -0,0 +1,70 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using PlasticGui.WebApi;
+using Unity.PlasticSCM.Editor.UI.UIElements;
+
+namespace Unity.PlasticSCM.Editor.Configuration.CloudEdition.Welcome
+{
+    internal class CloudEditionWelcomeWindow : EditorWindow
+    {
+        internal static void ShowWindow(IPlasticWebRestApi restApi)
+        {
+            CloudEditionWelcomeWindow window = GetWindow<CloudEditionWelcomeWindow>();
+            window.mRestApi = restApi;
+            window.titleContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.SignInToPlasticSCM));
+            window.minSize = new Vector2(800, 460);
+            window.Show();
+        }
+
+        void OnEnable()
+        {
+            BuildComponents();
+        }
+
+        void OnDestroy()
+        {
+            Dispose();
+        }
+
+        void Dispose()
+        {
+            mSignInPanel.Dispose();
+            mSSOSignUpPanel.Dispose();
+        }
+
+        internal void BuildComponents()
+        {
+            VisualElement root = rootVisualElement;
+
+            root.Clear();
+            mTabView = new TabView();
+
+            mSignInPanel = new SignInPanel(this);
+            mSSOSignUpPanel = new SSOSignUpPanel(this, mRestApi);
+
+            mTabView.AddTab(
+                PlasticLocalization.GetString(PlasticLocalization.Name.Login),
+                mSignInPanel);
+            mTabView.AddTab(
+                PlasticLocalization.GetString(PlasticLocalization.Name.SignUp),
+                mSSOSignUpPanel).clicked += () =>
+                {
+                    titleContent = new GUIContent(
+                        PlasticLocalization.GetString(PlasticLocalization.Name.SignUp));
+                };
+
+            root.Add(mTabView);
+        }
+
+        internal TabView mTabView;
+
+        SignInPanel mSignInPanel;
+        SSOSignUpPanel mSSOSignUpPanel;
+
+        IPlasticWebRestApi mRestApi;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CloudEditionWelcomeWindow.cs.meta b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CloudEditionWelcomeWindow.cs.meta
new file mode 100644
index 0000000..44fcd41
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CloudEditionWelcomeWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0ad54f9e1bb701142b116d0d1ed98437
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreateOrganizationPanel.cs b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreateOrganizationPanel.cs
new file mode 100644
index 0000000..3d5e130
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreateOrganizationPanel.cs
@@ -0,0 +1,167 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.UIElements;
+
+namespace Unity.PlasticSCM.Editor.Configuration.CloudEdition.Welcome
+{
+    internal class CreateOrganizationPanel : VisualElement
+    {
+        internal CreateOrganizationPanel(VisualElement rootPanel)
+        {
+            mRootPanel = rootPanel;
+
+            InitializeLayoutAndStyles();
+
+            BuildComponents();
+        }
+
+        internal void Dispose()
+        {
+            mLoadingSpinner.Dispose();
+
+            mCreateButton.clicked -= CreateButton_Clicked;
+
+            mOrganizationNameTextField.UnregisterValueChangedCallback(
+                OnOrganizationNameTextFieldChanged);
+        }
+
+        void StartProgress()
+        {
+            mGettingDatacenters.RemoveFromClassList("hidden");
+            mLoadingSpinner.Start();
+        }
+
+        void StopProgress()
+        {
+            mGettingDatacenters.AddToClassList("hidden");
+            mLoadingSpinner.Stop();
+        }
+
+        void OnOrganizationNameTextFieldChanged(ChangeEvent<string> evt)
+        {
+            mOrganizationNameNotification.text = "";
+        }
+
+        void DataCenterClicked(DropdownMenuAction action)
+        {
+            mSelectedDatacenter = action.name;
+            mDatacenter.text = action.name;
+        }
+
+        void CreateButton_Clicked()
+        {
+            //TODO: Launch organization creation task
+
+            mRootPanel.Clear();
+            mRootPanel.Add(new CreatedOrganizationPanel(mOrganizationNameTextField.text));
+        }
+
+        DropdownMenuAction.Status DataCenterActive(DropdownMenuAction action)
+        {
+            if (action.name == mSelectedDatacenter)
+                return DropdownMenuAction.Status.Checked;
+
+            return DropdownMenuAction.Status.Normal;
+        }
+
+        IEnumerable<string> GetDatacenters()
+        {
+            // TODO: Replace with call
+            return new string[]
+            {
+                "Test Server 1",
+                "Test Server 2",
+                "Test Server 3",
+                "Test Server 4",
+                "Test Server 5"
+            };
+        }
+
+        static void SetGettingDatacentersVisibility(
+            VisualElement gettingDatacenters,
+            bool visible)
+        {
+            if (visible)
+            {
+                gettingDatacenters.AddToClassList("hidden");
+                return;
+            }
+
+            gettingDatacenters.RemoveFromClassList("hidden");
+        }
+
+        void BuildComponents()
+        {
+            this.SetControlImage("buho",
+                PlasticGui.Help.HelpImage.ColorBuho);
+
+            VisualElement spinnerControl = this.Query<VisualElement>("gdSpinner").First();
+            mLoadingSpinner = new LoadingSpinner();
+            spinnerControl.Add(mLoadingSpinner);
+
+            IEnumerable<string> datacenters = GetDatacenters();
+            mSelectedDatacenter = datacenters.FirstOrDefault();
+            mDatacenter = new ToolbarMenu { text = mSelectedDatacenter };
+            foreach (string datacenter in GetDatacenters())
+                mDatacenter.menu.AppendAction(datacenter, DataCenterClicked, DataCenterActive);
+            VisualElement datacenterContainer = this.Query<VisualElement>("datacenter").First();
+            datacenterContainer.Add(mDatacenter);
+
+            mOrganizationNameTextField = this.Query<TextField>("orgName").First();
+            mOrganizationNameNotification = this.Query<Label>("orgNameNotification").First();
+            mBackButton = this.Query<Button>("back").First();
+            mCreateButton = this.Query<Button>("create").First();
+            mEncryptLearnMoreButton = this.Query<Button>("encryptLearnMore").First();
+            mGettingDatacenters = this.Query<VisualElement>("gettingDatacenters").First();
+
+            mCreateButton.clicked += CreateButton_Clicked;
+
+            mOrganizationNameTextField.RegisterValueChangedCallback(
+                OnOrganizationNameTextFieldChanged);
+            mOrganizationNameTextField.FocusOnceLoaded();
+
+            this.SetControlText<Label>("createLabel",
+                PlasticLocalization.Name.CreateOrganizationTitle);
+            this.SetControlLabel<TextField>("orgName",
+                PlasticLocalization.Name.OrganizationName);
+            this.SetControlText<Label>("datacenterLabel",
+                PlasticLocalization.Name.Datacenter);
+            this.SetControlText<Toggle>("encryptData",
+                PlasticLocalization.Name.EncryptionCheckButton);
+            this.SetControlText<Label>("encryptExplanation",
+                PlasticLocalization.Name.EncryptionCheckButtonExplanation, "");
+            this.SetControlText<Button>("encryptLearnMore",
+                PlasticLocalization.Name.LearnMore);
+            this.SetControlText<Label>("gdLabel",
+                PlasticLocalization.Name.GettingDatacenters);
+            this.SetControlText<Button>("back",
+                PlasticLocalization.Name.BackButton);
+            this.SetControlText<Button>("create",
+                PlasticLocalization.Name.CreateButton);
+        }
+
+        void InitializeLayoutAndStyles()
+        {
+            this.LoadLayout(typeof(CreateOrganizationPanel).Name);
+
+            this.LoadStyle("SignInSignUp");
+            this.LoadStyle(typeof(CreateOrganizationPanel).Name);
+        }
+
+        VisualElement mRootPanel;
+        TextField mOrganizationNameTextField;
+        Label mOrganizationNameNotification;
+        ToolbarMenu mDatacenter;
+        Button mBackButton;
+        Button mCreateButton;
+        Button mEncryptLearnMoreButton;
+        VisualElement mGettingDatacenters;
+        LoadingSpinner mLoadingSpinner;
+        string mSelectedDatacenter;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreateOrganizationPanel.cs.meta b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreateOrganizationPanel.cs.meta
new file mode 100644
index 0000000..d2f5a53
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreateOrganizationPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2104516cde04b204884f055f58f980d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreatedOrganizationPanel.cs b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreatedOrganizationPanel.cs
new file mode 100644
index 0000000..1e0ed25
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreatedOrganizationPanel.cs
@@ -0,0 +1,42 @@
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.UIElements;
+
+namespace Unity.PlasticSCM.Editor.Configuration.CloudEdition.Welcome
+{
+    internal class CreatedOrganizationPanel : VisualElement
+    {
+        internal CreatedOrganizationPanel(string organizationName)
+        {
+            mOrganizationName = organizationName;
+
+            InitializeLayoutAndStyles();
+
+            BuildComponents();
+        }
+
+        void BuildComponents()
+        {
+            this.SetControlImage("buho",
+                PlasticGui.Help.HelpImage.CloudBuho);
+
+            this.SetControlText<Label>("createdTitle",
+                PlasticLocalization.Name.CreatedOrganizationTitle);
+            this.SetControlText<Label>("createdExplanation",
+                PlasticLocalization.Name.CreatedOrganizationExplanation, mOrganizationName);
+            this.SetControlText<Button>("continue",
+                PlasticLocalization.Name.ContinueButton);
+        }
+
+        void InitializeLayoutAndStyles()
+        {
+            this.LoadLayout(typeof(CreatedOrganizationPanel).Name);
+
+            this.LoadStyle("SignInSignUp");
+            this.LoadStyle(typeof(CreatedOrganizationPanel).Name);
+        }
+
+        string mOrganizationName;
+    } 
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreatedOrganizationPanel.cs.meta b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreatedOrganizationPanel.cs.meta
new file mode 100644
index 0000000..995a8bf
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/CreatedOrganizationPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8add2d9bdefea9d4ead4e1c5163c87c3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/OrganizationPanel.cs b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/OrganizationPanel.cs
new file mode 100644
index 0000000..cf05130
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/OrganizationPanel.cs
@@ -0,0 +1,102 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.UIElements;
+
+namespace Unity.PlasticSCM.Editor.Configuration.CloudEdition.Welcome
+{
+    internal class OrganizationPanel : VisualElement
+    {
+        internal OrganizationPanel(List<string> organizations)
+        {
+            mOrganizations = organizations;
+
+            InitializeLayoutAndStyles();
+
+            BuildComponents();
+        }
+
+        void BuildComponents()
+        {
+            this.SetControlImage("buho",
+                PlasticGui.Help.HelpImage.CloudBuho);
+
+            this.SetControlText<Label>("confirmationMessage",
+                PlasticLocalization.Name.SignedUpTitle);
+
+            if (mOrganizations.Count == 1)
+                BuildSingleOrganizationSection("Codice");
+            else if (mOrganizations.Count > 1)
+                BuildMultipleOrganizationsSection(mOrganizations);
+
+            BuildCreateOrganizationSection(!mOrganizations.Any());
+        }
+
+        void BuildSingleOrganizationSection(string organizationName)
+        {
+            mOrganizationToJoin = organizationName;
+
+            this.Query<VisualElement>("joinSingleOrganization").First().RemoveFromClassList("display-none");
+
+            this.SetControlText<Label>("joinSingleOrganizationLabel",
+                PlasticLocalization.Name.YouBelongToOrganization, organizationName);
+
+            this.SetControlText<Button>("joinSingleOrganizationButton",
+                PlasticLocalization.Name.JoinButton);
+        }
+
+        void BuildMultipleOrganizationsSection(List<string> organizationNames)
+        {
+            this.Query<VisualElement>("joinMultipleOrganizations").First().RemoveFromClassList("display-none");
+
+            this.SetControlText<Label>("joinMultipleOrganizationsLabel",
+                PlasticLocalization.Name.YouBelongToSeveralOrganizations);
+
+            VisualElement organizationDropdown = this.Query<VisualElement>("organizationDropdown").First();
+            ToolbarMenu toolbarMenu = new ToolbarMenu
+            {
+                text = organizationNames.FirstOrDefault()
+            };
+            foreach (string name in organizationNames)
+            {
+                toolbarMenu.menu.AppendAction(name, x => 
+                {
+                    toolbarMenu.text = name;
+                    mOrganizationToJoin = name;
+                }, DropdownMenuAction.AlwaysEnabled);
+                organizationDropdown.Add(toolbarMenu);
+            }
+
+            this.SetControlText<Button>("joinMultipleOrganizationsButton",
+                PlasticLocalization.Name.JoinButton);
+        }
+
+        void BuildCreateOrganizationSection(bool firstOrganization)
+        {
+            PlasticLocalization.Name createOrganizationLabelName = firstOrganization ?
+                PlasticLocalization.Name.CreateFirstOrganizationLabel :
+                PlasticLocalization.Name.CreateOtherOrganizationLabel;
+
+            this.SetControlText<Label>("createOrganizationLabel",
+                createOrganizationLabelName);
+
+            this.SetControlText<Button>("createOrganizationButton",
+                PlasticLocalization.Name.CreateButton);
+        }
+
+        void InitializeLayoutAndStyles()
+        {
+            this.LoadLayout(typeof(OrganizationPanel).Name);
+
+            this.LoadStyle("SignInSignUp");
+            this.LoadStyle(typeof(OrganizationPanel).Name);
+        }
+
+        List<string> mOrganizations;
+        public string mOrganizationToJoin = "";
+    }
+}
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/OrganizationPanel.cs.meta b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/OrganizationPanel.cs.meta
new file mode 100644
index 0000000..8ff451e
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/OrganizationPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 615ff93ab52eb8242a9194d4f711676f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SSOSignUpPanel.cs b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SSOSignUpPanel.cs
new file mode 100644
index 0000000..4a3450d
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SSOSignUpPanel.cs
@@ -0,0 +1,222 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using PlasticGui.WebApi;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.UIElements;
+
+namespace Unity.PlasticSCM.Editor.Configuration.CloudEdition.Welcome
+{
+    internal class SSOSignUpPanel : VisualElement
+    {
+        internal SSOSignUpPanel(
+            CloudEditionWelcomeWindow parentWindow,
+            IPlasticWebRestApi restApi)
+        {
+            mParentWindow = parentWindow;
+            mRestApi = restApi;
+
+            InitializeLayoutAndStyles();
+
+            BuildComponents();
+        }
+
+        internal void Dispose()
+        {
+            mSignUpButton.clicked -= SignUpButton_Clicked;
+            mTermsOfServiceButton.clicked -= TermsOfServiceButton_Clicked;
+            mPrivacyPolicyButton.clicked -= PrivacyPolicyButton_Clicked;
+            mPrivacyPolicyStatementButton.clicked -= PrivacyPolicyStatementButton_Clicked;
+
+            mUserNameTextField.UnregisterValueChangedCallback(
+                OnUserNameTextFieldChanged);
+            mPasswordTextField.UnregisterValueChangedCallback(
+                OnPasswordTextFieldChanged);
+            mConfirmPasswordTextField.UnregisterValueChangedCallback(
+                OnPasswordTextFieldChanged);
+        }
+
+        void OnUserNameTextFieldChanged(ChangeEvent<string> evt)
+        {
+            if (!evt.newValue.Contains('@'))
+            {
+                mUserNotificationLabel.RemoveFromClassList("hidden");
+                mValidEmail = false;
+            }
+            else
+            {
+                mUserNotificationLabel.AddToClassList("hidden");
+                mValidEmail = true;
+            }
+
+            SetSignUpButtonEnablement();
+        }
+
+        void OnPasswordTextFieldChanged(ChangeEvent<string> evt)
+        {
+            if (mPasswordTextField.value != mConfirmPasswordTextField.value)
+            {
+                mPasswordNotificationLabel.RemoveFromClassList("hidden");
+                mMatchingPasswords = false;
+            }
+            else
+            {
+                mPasswordNotificationLabel.AddToClassList("hidden");
+                mMatchingPasswords = true;
+            }
+
+            SetSignUpButtonEnablement();
+        }
+
+        void SignUpButton_Clicked()
+        {
+            OrganizationPanel organizationPanel = new OrganizationPanel(
+                    new List<string>() { "codice@codice", "skullcito@codice" });
+            //OrganizationPanel organizationPanel = new OrganizationPanel(new List<string>() { "codice@codice" });
+            //OrganizationPanel organizationPanel = new OrganizationPanel(new List<string>() { });
+            mParentWindow.mTabView.SwitchContent(organizationPanel);
+        }
+
+        void TermsOfServiceButton_Clicked()
+        {
+            Application.OpenURL("https://www.plasticscm.com/releases/eula/licenseagreement.pdf");
+        }
+
+        void PrivacyPolicyButton_Clicked()
+        {
+            Application.OpenURL("https://unity3d.com/legal/privacy-policy");
+        }
+
+        void PrivacyPolicyStatementButton_Clicked()
+        {
+            // TODO: update when dll is avaiable PlasticGui.Configuration.CloudEdition.Welcome
+            //       SignUp.PRIVACY_POLICY_URL
+            Application.OpenURL("https://unity3d.com/legal/privacy-policy");
+        }
+
+        void SetSignUpButtonEnablement()
+        {
+            if (!mValidEmail || !mMatchingPasswords || String.IsNullOrEmpty(mPasswordTextField.value))
+                mSignUpButton.SetEnabled(false);
+            else
+                mSignUpButton.SetEnabled(true);
+        }
+
+        void BuildComponents()
+        {
+            this.SetControlImage("buho",
+                PlasticGui.Help.HelpImage.GenericBuho);
+
+            this.SetControlText<Label>("signUpLabel",
+                PlasticLocalization.Name.SignUp);
+
+            mUserNameTextField = this.Q<TextField>("emailField");
+            mUserNameTextField.label = PlasticLocalization.GetString(
+                PlasticLocalization.Name.Email);
+            mUserNameTextField.RegisterValueChangedCallback(
+                OnUserNameTextFieldChanged);
+
+            mUserNotificationLabel = this.Q<Label>("emailNotification");
+            mUserNotificationLabel.text = PlasticLocalization.GetString(
+                PlasticLocalization.Name.EnterValidEmailAddress);
+
+            mPasswordTextField = this.Q<TextField>("passwordField");
+            mPasswordTextField.label = PlasticLocalization.GetString(
+                PlasticLocalization.Name.Password);
+            mPasswordTextField.RegisterValueChangedCallback(
+                OnPasswordTextFieldChanged);
+
+            mConfirmPasswordTextField = this.Q<TextField>("confirmPasswordField");
+            mConfirmPasswordTextField.label = PlasticLocalization.GetString(
+                PlasticLocalization.Name.ConfirmPassword);
+            mConfirmPasswordTextField.RegisterValueChangedCallback(
+                OnPasswordTextFieldChanged);
+
+            mPasswordNotificationLabel = this.Q<Label>("passwordNotificationLabel");
+            mPasswordNotificationLabel.text = PlasticLocalization.GetString(
+                PlasticLocalization.Name.PasswordDoesntMatch);
+
+            mSignUpButton = this.Q<Button>("signUp");
+            mSignUpButton.text = PlasticLocalization.GetString(PlasticLocalization.Name.SignUp);
+            mSignUpButton.clicked += SignUpButton_Clicked;
+
+            string[] signUpText = PlasticLocalization.GetString(
+                PlasticLocalization.Name.SignUpAgreeToShort).Split('{', '}');
+            Label signUpAgreePt1 = this.Q<Label>("signUpAgreePt1");
+            signUpAgreePt1.text = signUpText[0];
+
+            mTermsOfServiceButton = this.Q<Button>("termsOfService");
+            mTermsOfServiceButton.text = PlasticLocalization.GetString(PlasticLocalization.Name.TermsOfService);
+            mTermsOfServiceButton.clicked += TermsOfServiceButton_Clicked;
+
+            Label signUpAgreePt2 = this.Q<Label>("signUpAgreePt2");
+            signUpAgreePt2.text = signUpText[2];
+
+            mPrivacyPolicyButton = this.Q<Button>("privacyPolicy");
+            mPrivacyPolicyButton.text = PlasticLocalization.GetString(PlasticLocalization.Name.PrivacyPolicy);
+            mPrivacyPolicyButton.clicked += PrivacyPolicyButton_Clicked;
+
+            List<VisualElement> dashes = this.Query<VisualElement>("dash").ToList();
+            if (EditorGUIUtility.isProSkin)
+                dashes.ForEach(x => x.style.borderTopColor = new StyleColor(new UnityEngine.Color(0.769f, 0.769f, 0.769f)));
+            else
+                dashes.ForEach(x => x.style.borderTopColor = new StyleColor(new UnityEngine.Color(0.008f, 0.008f, 0.008f)));
+
+            this.SetControlText<Label>("or",
+                PlasticLocalization.Name.Or);
+
+            this.SetControlImage("unityIcon",
+                Images.Name.ButtonSsoSignInUnity);
+
+            Button unityIDButton = this.Q<Button>("unityIDButton");
+            unityIDButton.text = PlasticLocalization.GetString(PlasticLocalization.Name.SignUpUnityID);
+
+            this.SetControlImage("googleIcon",
+                Images.Name.ButtonSsoSignInGoogle);
+
+            Button googleButton = this.Q<Button>("googleButton");
+            googleButton.text = PlasticLocalization.GetString(PlasticLocalization.Name.SignUpGoogle);
+
+            this.SetControlText<Label>("privacyStatementText",
+                PlasticLocalization.Name.PrivacyStatementText,
+                PlasticLocalization.GetString(PlasticLocalization.Name.PrivacyStatement));
+
+            mPrivacyPolicyStatementButton = this.Query<Button>("privacyStatement").First();
+            mPrivacyPolicyStatementButton.text = PlasticLocalization.GetString(
+                PlasticLocalization.Name.PrivacyStatement);
+            mPrivacyPolicyStatementButton.clicked += PrivacyPolicyStatementButton_Clicked;
+
+            SetSignUpButtonEnablement();
+        }
+
+        void InitializeLayoutAndStyles()
+        {
+            this.LoadLayout(typeof(SSOSignUpPanel).Name);
+
+            this.LoadStyle("SignInSignUp");
+            this.LoadStyle(typeof(SSOSignUpPanel).Name);
+        }
+
+        Button mTermsOfServiceButton;
+        Button mPrivacyPolicyButton;
+        Button mPrivacyPolicyStatementButton;
+        TextField mUserNameTextField;
+        TextField mPasswordTextField;
+        TextField mConfirmPasswordTextField;
+        Label mUserNotificationLabel;
+        Label mPasswordNotificationLabel;
+        Button mSignUpButton;
+
+        bool mValidEmail;
+        bool mMatchingPasswords;
+
+        readonly CloudEditionWelcomeWindow mParentWindow;
+        readonly IPlasticWebRestApi mRestApi;
+    }
+}
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SSOSignUpPanel.cs.meta b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SSOSignUpPanel.cs.meta
new file mode 100644
index 0000000..622ed53
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SSOSignUpPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1284741c63bbe7742a2d359492947023
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInPanel.cs b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInPanel.cs
new file mode 100644
index 0000000..2cb838e
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInPanel.cs
@@ -0,0 +1,105 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.UIElements;
+
+namespace Unity.PlasticSCM.Editor.Configuration.CloudEdition.Welcome
+{
+    internal class SignInPanel : VisualElement
+    {
+        internal SignInPanel(
+            CloudEditionWelcomeWindow parentWindow)
+        {
+            mParentWindow = parentWindow;
+
+            InitializeLayoutAndStyles();
+
+            BuildComponents();
+        }
+
+        internal void Dispose()
+        {
+            mSignInWithUnityIdButton.clicked -= SignInWithUnityIdButton_Clicked;
+            mSignInWithEmailButton.clicked -= SignInWithEmailButton_Clicked;
+            mPrivacyPolicyStatementButton.clicked -= PrivacyPolicyStatementButton_Clicked;
+
+            if (mSignInWithEmailPanel != null)
+                mSignInWithEmailPanel.Dispose();
+
+            if (mWaitingSignInPanel != null)
+                mWaitingSignInPanel.Dispose();
+        }
+
+        void SignInWithEmailButton_Clicked()
+        {
+            mSignInWithEmailPanel = new SignInWithEmailPanel(mParentWindow);
+
+            mParentWindow.rootVisualElement.Clear();
+            mParentWindow.rootVisualElement.Add(mSignInWithEmailPanel);
+        }
+
+        void SignInWithUnityIdButton_Clicked()
+        {
+            mWaitingSignInPanel = new WaitingSignInPanel(mParentWindow);
+
+            mParentWindow.rootVisualElement.Clear();
+            mParentWindow.rootVisualElement.Add(mWaitingSignInPanel);
+        }
+
+        void PrivacyPolicyStatementButton_Clicked()
+        {
+            // TODO: update when dll is avaiable PlasticGui.Configuration.CloudEdition.Welcome
+            //       SignUp.PRIVACY_POLICY_URL
+            Application.OpenURL("https://unity3d.com/legal/privacy-policy");
+        }
+
+        void BuildComponents()
+        {
+            this.SetControlImage("buho",
+                PlasticGui.Help.HelpImage.CloudBuho);
+
+            this.SetControlText<Label>("signInToPlasticSCM",
+                PlasticLocalization.Name.SignInToPlasticSCM);
+
+            this.SetControlImage("iconUnity",
+                Images.Name.ButtonSsoSignInUnity);
+
+            mSignInWithUnityIdButton = this.Query<Button>("signInWithUnityId").First();
+            mSignInWithUnityIdButton.text = PlasticLocalization.GetString(
+                PlasticLocalization.Name.SignInWithUnityID);
+            mSignInWithUnityIdButton.clicked += SignInWithUnityIdButton_Clicked;
+
+            this.SetControlImage("iconEmail",
+                Images.Name.ButtonSsoSignInEmail);
+
+            mSignInWithEmailButton = this.Query<Button>("signInWithEmail").First();
+            mSignInWithEmailButton.clicked += SignInWithEmailButton_Clicked;
+
+            this.SetControlText<Label>("privacyStatementText",
+                PlasticLocalization.Name.PrivacyStatementText,
+                PlasticLocalization.GetString(PlasticLocalization.Name.PrivacyStatement));
+
+            mPrivacyPolicyStatementButton = this.Query<Button>("privacyStatement").First();
+            mPrivacyPolicyStatementButton.text = PlasticLocalization.GetString(
+                PlasticLocalization.Name.PrivacyStatement);
+            mPrivacyPolicyStatementButton.clicked += PrivacyPolicyStatementButton_Clicked;
+        }
+
+        void InitializeLayoutAndStyles()
+        {
+            this.LoadLayout(typeof(SignInPanel).Name);
+
+            this.LoadStyle("SignInSignUp");
+            this.LoadStyle(typeof(SignInPanel).Name);
+        }
+
+        SignInWithEmailPanel mSignInWithEmailPanel;
+        WaitingSignInPanel mWaitingSignInPanel;
+        CloudEditionWelcomeWindow mParentWindow;
+        Button mSignInWithUnityIdButton;
+        Button mSignInWithEmailButton;
+        Button mPrivacyPolicyStatementButton;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInPanel.cs.meta b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInPanel.cs.meta
new file mode 100644
index 0000000..2aa8a45
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bba806fdb20eb5a4da6cc856323d6273
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInWithEmailPanel.cs b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInWithEmailPanel.cs
new file mode 100644
index 0000000..86f08a1
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInWithEmailPanel.cs
@@ -0,0 +1,86 @@
+using UnityEditor;
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.UIElements;
+
+namespace Unity.PlasticSCM.Editor.Configuration.CloudEdition.Welcome
+{
+    internal class SignInWithEmailPanel : VisualElement
+    {
+        internal SignInWithEmailPanel(CloudEditionWelcomeWindow parentWindow)
+        {
+            mParentWindow = parentWindow;
+
+            InitializeLayoutAndStyles();
+
+            BuildComponents();
+        }
+
+        internal void Dispose()
+        {
+            mSignInButton.clicked -= SignInButton_Clicked;
+            mBackButton.clicked -= BackButton_Clicked;
+        }
+
+        void SignInButton_Clicked()
+        {
+            // TODO: Replace this with validation and sign in logic
+            string message = string.Format("Signing in as '{0}' with password '{1}'",
+                mEmailField.text,
+                mPasswordField.text);
+
+            EditorUtility.DisplayDialog("Test", message, "Ok");
+        }
+
+        void BackButton_Clicked()
+        {
+            mParentWindow.BuildComponents();
+        }
+
+        void BuildComponents()
+        {
+            mEmailField = this.Query<TextField>("email").First();
+            mPasswordField = this.Query<TextField>("password").First();
+            mEmailNotificationLabel = this.Query<Label>("emailNotification").First();
+            mPasswordNotificationLabel = this.Query<Label>("passwordNotification").First();
+            mSignInButton = this.Query<Button>("signIn").First();
+            mBackButton = this.Query<Button>("back").First();
+
+            mSignInButton.clicked += SignInButton_Clicked;
+            mBackButton.clicked += BackButton_Clicked;
+            mEmailField.FocusOnceLoaded();
+
+            this.SetControlImage("buho",
+                PlasticGui.Help.HelpImage.CloudBuho);
+            this.SetControlText<Label>("signInLabel",
+                PlasticLocalization.Name.SignInWithEmail);
+            this.SetControlLabel<TextField>("email",
+                PlasticLocalization.Name.Email);
+            this.SetControlLabel<TextField>("password",
+                PlasticLocalization.Name.Password);
+            this.SetControlText<Button>("signIn",
+                PlasticLocalization.Name.SignInButton);
+            this.SetControlText<Button>("back",
+                PlasticLocalization.Name.BackButton);
+        }
+
+        void InitializeLayoutAndStyles()
+        {
+            this.LoadLayout(typeof(SignInWithEmailPanel).Name);
+
+            this.LoadStyle(typeof(SignInWithEmailPanel).Name);
+        }
+
+        TextField mEmailField;
+        TextField mPasswordField;
+
+        Label mEmailNotificationLabel;
+        Label mPasswordNotificationLabel;
+
+        Button mSignInButton;
+        Button mBackButton;
+
+        CloudEditionWelcomeWindow mParentWindow;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInWithEmailPanel.cs.meta b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInWithEmailPanel.cs.meta
new file mode 100644
index 0000000..9255f35
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/SignInWithEmailPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 85f4628ae66f0eb439e59db66adbc696
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/WaitingSignInPanel.cs b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/WaitingSignInPanel.cs
new file mode 100644
index 0000000..876e297
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/WaitingSignInPanel.cs
@@ -0,0 +1,61 @@
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.UIElements;
+
+namespace Unity.PlasticSCM.Editor.Configuration.CloudEdition.Welcome
+{
+    internal class WaitingSignInPanel : VisualElement
+    {
+        internal WaitingSignInPanel(CloudEditionWelcomeWindow parentWindow)
+        {
+            mParentWindow = parentWindow;
+
+            InitializeLayoutAndStyles();
+
+            BuildComponents();
+        }
+
+        internal void Dispose()
+        {
+            mCancelButton.clicked -= CancelButton_Clicked;
+        }
+
+        void CancelButton_Clicked()
+        {
+            mParentWindow.BuildComponents();
+        }
+
+        void BuildComponents()
+        {
+            this.SetControlImage("buho",
+                PlasticGui.Help.HelpImage.GenericBuho);
+
+            this.SetControlText<Label>("signInToPlasticSCM",
+                PlasticLocalization.Name.SignInToPlasticSCM);
+
+            this.SetControlText<Label>("completeSignInOnBrowser",
+                PlasticLocalization.Name.CompleteSignInOnBrowser);
+
+            this.SetControlText<Label>("oAuthSignInCheckMessage",
+                PlasticLocalization.Name.OAuthSignInCheckMessage);
+
+            mCancelButton = this.Query<Button>("cancelButton").First();
+            mCancelButton.text = PlasticLocalization.GetString(
+                PlasticLocalization.Name.CancelButton);
+            mCancelButton.clicked += CancelButton_Clicked;
+        }
+
+        void InitializeLayoutAndStyles()
+        {
+            this.LoadLayout(typeof(WaitingSignInPanel).Name);
+
+            this.LoadStyle("SignInSignUp");
+            this.LoadStyle(typeof(WaitingSignInPanel).Name);
+        }
+
+        Button mCancelButton;
+
+        readonly CloudEditionWelcomeWindow mParentWindow;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/WaitingSignInPanel.cs.meta b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/WaitingSignInPanel.cs.meta
new file mode 100644
index 0000000..7c4523c
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CloudEdition/Welcome/WaitingSignInPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 077387e98bf29fb4a97bccfb592cfaf7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/ConfigurePartialWorkspace.cs b/Editor/PlasticSCM/Configuration/ConfigurePartialWorkspace.cs
new file mode 100644
index 0000000..2cf937e
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/ConfigurePartialWorkspace.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.IO;
+
+using Codice.Client.Commands.Mount;
+using Codice.Client.Commands.WkTree;
+using Codice.Client.Common;
+using Codice.Client.Common.GameUI;
+using Codice.CM.Common;
+using Codice.CM.WorkspaceServer.DataStore.Configuration;
+
+namespace Unity.PlasticSCM.Editor.Configuration
+{
+    internal static class ConfigurePartialWorkspace
+    {
+        internal static void AsFullyChecked(WorkspaceInfo wkInfo)
+        {
+            string rootPath = WorkspacePath.GetWorkspacePathFromCmPath(
+                wkInfo.ClientPath, "/", Path.DirectorySeparatorChar);
+
+            WorkspaceTreeNode rootWkNode = CmConnection.Get().GetWorkspaceTreeHandler().
+                WkGetWorkspaceTreeNode(rootPath);
+
+            FullyCheckedDirectory rootDirectory = new FullyCheckedDirectory();
+            rootDirectory.MountId = MountPointId.WORKSPACE_ROOT;
+            rootDirectory.ItemId = rootWkNode.RevInfo.ItemId;
+
+            List<FullyCheckedDirectory> directoryList = new List<FullyCheckedDirectory>();
+            directoryList.Add(rootDirectory);
+
+            FullyCheckedDirectoriesStorage.Save(wkInfo, directoryList);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Configuration/ConfigurePartialWorkspace.cs.meta b/Editor/PlasticSCM/Configuration/ConfigurePartialWorkspace.cs.meta
new file mode 100644
index 0000000..cad370b
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/ConfigurePartialWorkspace.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2b3223ee740687445a7e4bc793fa2aae
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CredentialsDialog.cs b/Editor/PlasticSCM/Configuration/CredentialsDialog.cs
new file mode 100644
index 0000000..034a395
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CredentialsDialog.cs
@@ -0,0 +1,158 @@
+using UnityEngine;
+
+using UnityEditor;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Codice.CM.Common;
+using Codice.Client.Common.Connection;
+
+namespace Unity.PlasticSCM.Editor.Configuration
+{
+    internal class CredentialsDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 525, 250);
+
+
+            }
+        }
+
+        internal static AskCredentialsToUser.DialogData RequestCredentials(
+            string server,
+            EditorWindow parentWindow)
+        {
+            CredentialsDialog dialog = Create(
+                server, new ProgressControlsForDialogs());
+
+            ResponseType dialogResult = dialog.RunModal(parentWindow);
+
+            return dialog.BuildCredentialsDialogData(dialogResult);
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(
+                PlasticLocalization.Name.CredentialsDialogTitle));
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.CredentialsDialogExplanation, mServer));
+
+            GUILayout.Space(5);
+
+            DoEntriesArea();
+
+            GUILayout.Space(10);
+
+            DrawProgressForDialogs.For(
+                mProgressControls.ProgressData);
+
+            GUILayout.Space(10);
+
+            DoButtonsArea();
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.CredentialsDialogTitle);
+        }
+
+        AskCredentialsToUser.DialogData BuildCredentialsDialogData(
+            ResponseType dialogResult)
+        {
+            return new AskCredentialsToUser.DialogData(
+                dialogResult == ResponseType.Ok,
+                mUser, mPassword, mSaveProfile, SEIDWorkingMode.LDAPWorkingMode);
+        }
+
+        void DoEntriesArea()
+        {
+            mUser = TextEntry(PlasticLocalization.GetString(
+                PlasticLocalization.Name.UserName), mUser,
+                ENTRY_WIDTH, ENTRY_X);
+
+            GUILayout.Space(5);
+
+            mPassword = PasswordEntry(PlasticLocalization.GetString(
+                PlasticLocalization.Name.Password), mPassword,
+                ENTRY_WIDTH, ENTRY_X);
+
+            GUILayout.Space(5);
+
+            mSaveProfile = ToggleEntry(PlasticLocalization.GetString(
+                PlasticLocalization.Name.RememberCredentialsAsProfile),
+                mSaveProfile, ENTRY_WIDTH, ENTRY_X);
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoOkButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoOkButton();
+            }
+        }
+
+        void DoOkButton()
+        {
+            if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.OkButton)))
+                return;
+
+            OkButtonWithValidationAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        void OkButtonWithValidationAction()
+        {
+            CredentialsDialogValidation.AsyncValidation(
+                BuildCredentialsDialogData(ResponseType.Ok), this, mProgressControls);
+        }
+
+        static CredentialsDialog Create(
+            string server,
+            ProgressControlsForDialogs progressControls)
+        {
+            var instance = CreateInstance<CredentialsDialog>();
+            instance.mServer = server;
+            instance.mProgressControls = progressControls;
+            instance.mEnterKeyAction = instance.OkButtonWithValidationAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            return instance;
+        }
+
+        string mUser;
+        string mPassword = string.Empty;
+
+        ProgressControlsForDialogs mProgressControls;
+        bool mSaveProfile;
+
+        string mServer;
+
+        const float ENTRY_WIDTH = 345f;
+        const float ENTRY_X = 150f;
+    }
+}
diff --git a/Editor/PlasticSCM/Configuration/CredentialsDialog.cs.meta b/Editor/PlasticSCM/Configuration/CredentialsDialog.cs.meta
new file mode 100644
index 0000000..a93528a
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CredentialsDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c46424c57c6462945b14ac0c95281406
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/CredentialsUIImpl.cs b/Editor/PlasticSCM/Configuration/CredentialsUIImpl.cs
new file mode 100644
index 0000000..03a8455
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CredentialsUIImpl.cs
@@ -0,0 +1,56 @@
+using UnityEditor;
+
+using Codice.Client.Common;
+using Codice.Client.Common.Connection;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Configuration
+{
+    internal class CredentialsUiImpl : AskCredentialsToUser.IGui
+    {
+        internal CredentialsUiImpl(EditorWindow parentWindow)
+        {
+            mParentWindow = parentWindow;
+        }
+
+        AskCredentialsToUser.DialogData AskCredentialsToUser.IGui.AskUserForCredentials(string servername)
+        {
+            AskCredentialsToUser.DialogData result = null;
+
+            GUIActionRunner.RunGUIAction(delegate
+            {
+                result = CredentialsDialog.RequestCredentials(
+                        servername, mParentWindow);
+            });
+
+            return result;
+        }
+
+        void AskCredentialsToUser.IGui.ShowSaveProfileErrorMessage(string message)
+        {
+            GUIActionRunner.RunGUIAction(delegate
+            {
+                GuiMessage.ShowError(string.Format(
+                    PlasticLocalization.GetString(
+                        PlasticLocalization.Name.CredentialsErrorSavingProfile),
+                    message));
+            });
+        }
+
+        AskCredentialsToUser.DialogData AskCredentialsToUser.IGui.AskUserForSSOCredentials(string cloudServer)
+        {
+            AskCredentialsToUser.DialogData result = null;
+
+            GUIActionRunner.RunGUIAction(delegate
+            {
+                result = CredentialsDialog.RequestCredentials(
+                    cloudServer, mParentWindow);
+            });
+
+            return result;
+        }
+
+        EditorWindow mParentWindow;
+    }
+}
diff --git a/Editor/PlasticSCM/Configuration/CredentialsUIImpl.cs.meta b/Editor/PlasticSCM/Configuration/CredentialsUIImpl.cs.meta
new file mode 100644
index 0000000..3b30588
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/CredentialsUIImpl.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 50d82b3e371b7cc42abc2999039b19cb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/EncryptionConfigurationDialog.cs b/Editor/PlasticSCM/Configuration/EncryptionConfigurationDialog.cs
new file mode 100644
index 0000000..cde4c43
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/EncryptionConfigurationDialog.cs
@@ -0,0 +1,196 @@
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Utils;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Configuration
+{
+    internal class EncryptionConfigurationDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 650, 425);
+            }
+        }
+
+        internal static EncryptionConfigurationDialogData RequestEncryptionPassword(
+            string server,
+            EditorWindow parentWindow)
+        {
+            EncryptionConfigurationDialog dialog = Create(server);
+
+            ResponseType dialogResult = dialog.RunModal(parentWindow);
+
+            EncryptionConfigurationDialogData result =
+                dialog.BuildEncryptionConfigurationData();
+
+            result.Result = dialogResult == ResponseType.Ok;
+            return result;
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(
+                PlasticLocalization.Name.EncryptionConfiguration));
+
+            GUILayout.Space(20);
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.EncryptionConfigurationExplanation, mServer));
+
+            DoPasswordArea();
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.EncryptionConfigurationRemarks, mServer));
+
+            GUILayout.Space(10);
+
+            DoNotificationArea();
+
+            GUILayout.Space(10);
+
+            DoButtonsArea();
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.EncryptionConfiguration);
+        }
+
+        EncryptionConfigurationDialogData BuildEncryptionConfigurationData()
+        {
+            return new EncryptionConfigurationDialogData(
+                CryptoServices.GetEncryptedPassword(mPassword.Trim()));
+        }
+
+        void DoPasswordArea()
+        {
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.EncryptionConfigurationEnterPassword));
+
+            GUILayout.Space(5);
+
+            mPassword = PasswordEntry(PlasticLocalization.GetString(
+                PlasticLocalization.Name.Password), mPassword,
+                PASSWORD_TEXT_WIDTH, PASSWORD_TEXT_X);
+
+            GUILayout.Space(5);
+
+            mRetypePassword = PasswordEntry(PlasticLocalization.GetString(
+                PlasticLocalization.Name.RetypePassword), mRetypePassword,
+                PASSWORD_TEXT_WIDTH, PASSWORD_TEXT_X);
+
+            GUILayout.Space(18f);
+        }
+
+        void DoNotificationArea()
+        {
+            if (string.IsNullOrEmpty(mErrorMessage))
+                return;
+
+            var rect = GUILayoutUtility.GetRect(
+                GUILayoutUtility.GetLastRect().width, 30);
+
+            EditorGUI.HelpBox(rect, mErrorMessage, MessageType.Error);
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoOkButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoOkButton();
+            }
+        }
+
+        void DoOkButton()
+        {
+            if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.OkButton)))
+                return;
+
+            OkButtonWithValidationAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        void OkButtonWithValidationAction()
+        {
+            if (IsValidPassword(
+                    mPassword.Trim(), mRetypePassword.Trim(),
+                    out mErrorMessage))
+            {
+                mErrorMessage = string.Empty;
+                OkButtonAction();
+                return;
+            }
+
+            mPassword = string.Empty;
+            mRetypePassword = string.Empty;
+        }
+
+        static bool IsValidPassword(
+            string password, string retypePassword,
+            out string errorMessage)
+        {
+            errorMessage = string.Empty;
+
+            if (string.IsNullOrEmpty(password))
+            {
+                errorMessage = PlasticLocalization.GetString(
+                    PlasticLocalization.Name.InvalidEmptyPassword);
+                return false;
+            }
+
+            if (!password.Equals(retypePassword))
+            {
+                errorMessage = PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PasswordDoesntMatch);
+                return false;
+            }
+
+            return true;
+        }
+
+        static EncryptionConfigurationDialog Create(string server)
+        {
+            var instance = CreateInstance<EncryptionConfigurationDialog>();
+            instance.mServer = server;
+            instance.mEnterKeyAction = instance.OkButtonWithValidationAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            return instance;
+        }
+
+        string mPassword = string.Empty;
+        string mRetypePassword = string.Empty;
+        string mErrorMessage = string.Empty;
+
+        string mServer = string.Empty;
+
+        const float PASSWORD_TEXT_WIDTH = 250f;
+        const float PASSWORD_TEXT_X = 200f;
+    }
+}
+
diff --git a/Editor/PlasticSCM/Configuration/EncryptionConfigurationDialog.cs.meta b/Editor/PlasticSCM/Configuration/EncryptionConfigurationDialog.cs.meta
new file mode 100644
index 0000000..be76121
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/EncryptionConfigurationDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 68d5bb402c52edc48b494a59b8971758
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/MissingEncryptionPasswordPromptHandler.cs b/Editor/PlasticSCM/Configuration/MissingEncryptionPasswordPromptHandler.cs
new file mode 100644
index 0000000..39d1966
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/MissingEncryptionPasswordPromptHandler.cs
@@ -0,0 +1,43 @@
+using UnityEditor;
+
+using Codice.Client.Common.Encryption;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Configuration
+{
+    internal class MissingEncryptionPasswordPromptHandler :
+        ClientEncryptionServiceProvider.IEncryptioPasswordProvider
+    {
+        internal MissingEncryptionPasswordPromptHandler(EditorWindow parentWindow)
+        {
+            mParentWindow = parentWindow;
+        }
+
+        string ClientEncryptionServiceProvider.IEncryptioPasswordProvider
+            .GetEncryptionEncryptedPassword(string server)
+        {
+            string result = null;
+
+            GUIActionRunner.RunGUIAction(delegate
+            {
+                result = AskForEncryptionPassword(server);
+            });
+
+            return result;
+        }
+
+        string AskForEncryptionPassword(string server)
+        {
+            EncryptionConfigurationDialogData dialogData =
+                EncryptionConfigurationDialog.RequestEncryptionPassword(server, mParentWindow);
+
+            if (!dialogData.Result)
+                return null;
+
+            return dialogData.EncryptedPassword;
+        }
+
+        EditorWindow mParentWindow;
+    }
+}
diff --git a/Editor/PlasticSCM/Configuration/MissingEncryptionPasswordPromptHandler.cs.meta b/Editor/PlasticSCM/Configuration/MissingEncryptionPasswordPromptHandler.cs.meta
new file mode 100644
index 0000000..10b3f41
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/MissingEncryptionPasswordPromptHandler.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4f6e4f3809c687045b21461609e2f78b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/TeamEdition.meta b/Editor/PlasticSCM/Configuration/TeamEdition.meta
new file mode 100644
index 0000000..149e5da
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/TeamEdition.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e9d092d8c9e8ffe48882f0c22e0e880d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/TeamEdition/TeamEditionConfigurationWindow.cs b/Editor/PlasticSCM/Configuration/TeamEdition/TeamEditionConfigurationWindow.cs
new file mode 100644
index 0000000..8160392
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/TeamEdition/TeamEditionConfigurationWindow.cs
@@ -0,0 +1,308 @@
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using Codice.CM.Common;
+using Codice.Client.Common;
+using Unity.PlasticSCM.Editor.UI.UIElements;
+using PlasticGui.Configuration.TeamEdition;
+using PlasticGui.Configuration;
+using PlasticGui.WebApi;
+
+namespace Unity.PlasticSCM.Editor.Configuration.TeamEdition
+{
+    internal class TeamEditionConfigurationWindow : EditorWindow
+    {
+        internal static void ShowWindow(IPlasticWebRestApi restApi)
+        {
+            TeamEditionConfigurationWindow window = GetWindow<TeamEditionConfigurationWindow>();
+            window.mRestApi = restApi;
+            window.titleContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.WelcomeToPlasticSCM));
+            window.minSize = new Vector2(650, 300);
+            window.Show();
+        }
+
+        void OnEnable()
+        {
+            InitializeLayoutAndStyles();
+
+            BuildComponents();
+        }
+
+        void Dispose()
+        {
+            mConnectButton.clicked -= ConnectButton_Clicked;
+            mCheckConnectionButton.clicked -= CheckConnectionButton_Clicked;
+            mOkButton.clicked -= OkButton_Clicked;
+            mCancelButton.clicked -= CancelButton_Clicked;
+            mServerTextField.UnregisterValueChangedCallback(OnServerTextFieldChanged);
+            mUseSslToggle.UnregisterValueChangedCallback(OnUseSslToggleChanged);
+
+            mLoadingSpinner.Dispose();
+        }
+
+        void ConnectButton_Clicked()
+        {
+            ConfigurationConnectServerButtonClickEvent.Click(
+                server: mUserAssistant.GetProposedServer(),
+                HideValidation: HideValidation,
+                ShowError: ShowServerValidationError,
+                ShowProgress: ShowProgress,
+                HideProgress: HideProgress,
+                ShowNotification: ShowServerNotificationMessage,
+                DisableButtons: () => { mConnectButton.SetEnabled(false); },
+                EnableButtons: () => { mConnectButton.SetEnabled(true); },
+                UpdatePasswordEntries: (bIsPasswordRequired, seidWorkingMode) =>
+                {
+                    UpdatePasswordEntries(bIsPasswordRequired);
+                },
+                NotifyWorkingMode: (mode) => { mSEIDWorkingMode = mode; },
+                NotifyConnectedStatus: (b) => { });
+
+            mUserTextField.SetEnabled(true);
+        }
+
+        void OnDestroy()
+        {
+            Dispose();
+        }
+
+        void CheckConnectionButton_Clicked()
+        {
+            ConfigurationCheckCredentialsButtonClickEvent.Click(
+                mSEIDWorkingMode,
+                mUserTextField.value,
+                mPasswordTextField.value,
+                Edition.Team,
+                mUserAssistant,
+                HideCredentialsValidationError,
+                ShowCheckCredentialsError,
+                ShowProgress,
+                HideProgress,
+                ShowNotification: ShowCredentialsNotificationMessage,
+                DisableButtons: () => { mCheckConnectionButton.SetEnabled(false); mConnectButton.SetEnabled(false); },
+                EnableButtons: () => { mCheckConnectionButton.SetEnabled(true); mConnectButton.SetEnabled(true); },
+                NotifyWorkingMode: (mode) => { mSEIDWorkingMode = mode; },
+                NotifyConnectedStatus: (status) => { },
+                restApi: mRestApi,
+                cmConnection: CmConnection.Get());
+        }
+
+        void CancelButton_Clicked()
+        {
+            Close();
+        }
+
+        void OkButton_Clicked()
+        {
+            if (!ValidateServerAndCreds.IsValidInput(
+                mUserAssistant.GetProposedServer(),
+                mUserTextField.value,
+                mSEIDWorkingMode,
+                mPasswordTextField.value,
+                ShowCheckCredentialsError))
+            {
+                return;
+            }
+
+            ConfigurationActions.SaveClientConfig(
+                mServerTextField.value,
+                mSEIDWorkingMode,
+                mUserTextField.value,
+                mPasswordTextField.value);
+
+            Close();
+        }
+
+        void HideCredentialsValidationError()
+        {
+            mCredentialsLabel.RemoveFromClassList("error");
+            mCredentialsLabel.AddToClassList("visibility-hidden");
+        }
+
+        void BuildComponents()
+        {
+            VisualElement root = rootVisualElement;
+
+            root.Query<Label>("plasticConfigurationTitle").First().text =
+                PlasticLocalization.GetString(PlasticLocalization.Name.PlasticConfigurationTitle);
+
+            root.SetControlText<Label>(
+                "plasticConfigurationExplanation",
+                PlasticLocalization.Name.PlasticConfigurationExplanation);
+
+            root.SetControlText<Label>("configurationServerInfo",
+                PlasticLocalization.Name.PlasticSCMServerLabel);
+
+            root.SetControlText<Button>(
+                "connect",
+                PlasticLocalization.Name.Connect);
+
+            root.SetControlText<Label>("useSsl",
+                PlasticLocalization.Name.UseSsl);
+
+            root.SetControlText<Label>("configurationUserNameInfo",
+               PlasticLocalization.Name.ConfigurationUserNameInfo);
+
+            root.SetControlText<Label>("configurationCredentialsInfo",
+                PlasticLocalization.Name.ConfigurationCredentialsInfo);
+
+            root.SetControlText<Button>("check",
+                PlasticLocalization.Name.Check);
+
+            root.SetControlText<Label>("credentialsOk",
+                PlasticLocalization.Name.CredentialsOK);
+
+            root.SetControlText<Button>("okButton",
+                PlasticLocalization.Name.OkButton);
+
+            root.SetControlText<Button>("cancelButton",
+                PlasticLocalization.Name.CancelButton);
+
+            mSpinnerContainer = root.Query<VisualElement>("spinnerContainer").First();
+            mSpinnerLabel = root.Query<Label>("spinnerLabel").First();
+
+            mLoadingSpinner = new LoadingSpinner();
+            mSpinnerContainer.Add(mLoadingSpinner);
+            mSpinnerContainer.AddToClassList("visibility-hidden");
+
+            mCheckConnectionButton = root.Query<Button>("check").First();
+            mCheckConnectionButton.clicked += CheckConnectionButton_Clicked;
+
+            mConnectButton = root.Query<Button>("connect").First();
+            mConnectButton.clicked += ConnectButton_Clicked;
+
+            mServerTextField = root.Query<TextField>("serverTextField").First();
+            mServerTextField.RegisterValueChangedCallback(OnServerTextFieldChanged);
+
+            mUseSslToggle = root.Query<Toggle>("useSslToogle").First();
+            mUseSslToggle.RegisterValueChangedCallback(OnUseSslToggleChanged);
+
+            mUserTextField = root.Query<TextField>("userTextField").First();
+            mUserTextField.value = Environment.UserName;
+            mUserTextField.SetEnabled(false);
+
+            mPasswordTextField = root.Query<TextField>("passwordTextField").First();
+            mPasswordTextField.isPasswordField = true;
+
+            mConnectedLabel = root.Query<Label>("connectedLabel").First();
+
+            mCredentialsLabel = root.Query<Label>("credentialsOk").First();
+
+            mOkButton = root.Query<Button>("okButton").First();
+            mOkButton.clicked += OkButton_Clicked;
+
+            mCancelButton = root.Query<Button>("cancelButton").First();
+            mCancelButton.clicked += CancelButton_Clicked;
+        }
+
+        void OnUseSslToggleChanged(ChangeEvent<bool> evt)
+        {
+            mUserAssistant.OnSslChanged(mServerTextField.value, evt.newValue);
+            mServerTextField.value = mUserAssistant.GetProposedServer();
+        }
+
+        void InitializeLayoutAndStyles()
+        {
+            VisualElement root = rootVisualElement;
+
+            root.LoadLayout(typeof(TeamEditionConfigurationWindow).Name);
+
+            root.LoadStyle(typeof(TeamEditionConfigurationWindow).Name);
+        }
+
+        void OnServerTextFieldChanged(ChangeEvent<string> evt)
+        {
+            mUserAssistant.OnServerChanged(evt.newValue);
+            mUseSslToggle.value = mUserAssistant.IsSslServer(evt.newValue);
+        }
+
+        void ShowServerNotificationMessage(string message)
+        {
+            mConnectedLabel.text = message;
+            mConnectedLabel.RemoveFromClassList("visibility-hidden");
+        }
+
+        void ShowServerValidationError(string message)
+        {
+            mConnectedLabel.text = message;
+            mConnectedLabel.AddToClassList("error");
+            mConnectedLabel.RemoveFromClassList("visibility-hidden");
+        }
+
+        void ShowCredentialsNotificationMessage(string message)
+        {
+            mCredentialsLabel.text = message;
+            mCredentialsLabel.RemoveFromClassList("visibility-hidden");
+        }
+
+        void ShowCheckCredentialsError(string message)
+        {
+            mCredentialsLabel.text = message;
+            mCredentialsLabel.AddToClassList("error");
+            mCredentialsLabel.RemoveFromClassList("visibility-hidden");
+        }
+
+        void HideValidation()
+        {
+            mConnectedLabel.RemoveFromClassList("error");
+            mConnectedLabel.AddToClassList("visibility-hidden");
+        }
+
+        void ShowProgress(string text)
+        {
+            mSpinnerLabel.text = text;
+
+            mSpinnerContainer.RemoveFromClassList("visibility-hidden");
+            mSpinnerLabel.RemoveFromClassList("visibility-hidden");
+            mLoadingSpinner.Start();
+        }
+
+        void HideProgress()
+        {
+            mLoadingSpinner.Stop();
+            mSpinnerContainer.AddToClassList("visibility-hidden");
+            mSpinnerLabel.AddToClassList("visibility-hidden");
+        }
+
+        void UpdatePasswordEntries(bool bIsPasswordRequired)
+        {
+            if (!bIsPasswordRequired)
+            {
+                mPasswordTextField.AddToClassList("display-none");
+                mUserTextField.SetEnabled(false);
+                mUserTextField.value = Environment.UserName;
+                return;
+            }
+
+            mUserTextField.SetEnabled(true);
+            mPasswordTextField.RemoveFromClassList("display-none");
+            mUserTextField.SelectAll();
+            mUserTextField.FocusWorkaround();
+        }
+
+        Button mConnectButton;
+        Label mConnectedLabel;
+        TextField mServerTextField;
+        TextField mPasswordTextField;
+        Toggle mUseSslToggle;
+        LoadingSpinner mLoadingSpinner;
+        Label mSpinnerLabel;
+        VisualElement mSpinnerContainer;
+        Button mCheckConnectionButton;
+        Label mCredentialsLabel;
+        Button mOkButton;
+        Button mCancelButton;
+
+        SEIDWorkingMode mSEIDWorkingMode = SEIDWorkingMode.UPWorkingMode;
+
+        ConfigurationDialogUserAssistant mUserAssistant =
+            new ConfigurationDialogUserAssistant();
+
+        IPlasticWebRestApi mRestApi;
+        TextField mUserTextField;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Configuration/TeamEdition/TeamEditionConfigurationWindow.cs.meta b/Editor/PlasticSCM/Configuration/TeamEdition/TeamEditionConfigurationWindow.cs.meta
new file mode 100644
index 0000000..5a445ea
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/TeamEdition/TeamEditionConfigurationWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c95121e1e2d89e648b9d0aed259caad9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/ToolConfig.cs b/Editor/PlasticSCM/Configuration/ToolConfig.cs
new file mode 100644
index 0000000..d02510f
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/ToolConfig.cs
@@ -0,0 +1,26 @@
+using System.IO;
+
+using Codice.Utils;
+
+namespace Unity.PlasticSCM.Editor.Configuration
+{
+    internal static class ToolConfig
+    {
+        internal static string GetUnityPlasticLogConfigFile()
+        {
+            return GetConfigFilePath(LOG_CONFIG_FILE);
+        }
+
+        static string GetConfigFilePath(string configfile)
+        {
+            string file = Path.Combine(ApplicationLocation.GetAppPath(), configfile);
+
+            if (File.Exists(file))
+                return file;
+
+            return UserConfigFolder.GetConfigFile(configfile);
+        }
+
+        const string LOG_CONFIG_FILE = "unityplastic.log.conf";
+    }
+}
diff --git a/Editor/PlasticSCM/Configuration/ToolConfig.cs.meta b/Editor/PlasticSCM/Configuration/ToolConfig.cs.meta
new file mode 100644
index 0000000..d4b1e33
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/ToolConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ee776820547bd654980004e8471df8e3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Configuration/WriteLogConfiguration.cs b/Editor/PlasticSCM/Configuration/WriteLogConfiguration.cs
new file mode 100644
index 0000000..3d57d9e
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/WriteLogConfiguration.cs
@@ -0,0 +1,66 @@
+using System.IO;
+
+namespace Unity.PlasticSCM.Editor.Configuration
+{
+    internal class WriteLogConfiguration
+    {
+        internal static void For(string logConfigPath)
+        {
+            string logDirectoryPath = GetPlasticLogDirectoryPath(logConfigPath);
+            string relevantLogFile = Path.Combine(logDirectoryPath, RELEVANT_LOG_FILE_NAME);
+            string debugLogFile = Path.Combine(logDirectoryPath, DEBUG_LOG_FILE_NAME);
+
+            using (StreamWriter sw = File.CreateText(logConfigPath))
+            {
+                sw.Write(string.Format(
+                    LOG_CONFIGURATION,
+                    relevantLogFile,
+                    debugLogFile));
+            }
+        }
+
+        static string GetPlasticLogDirectoryPath(string logConfigPath)
+        {
+            return Path.Combine(
+                Directory.GetParent(logConfigPath).FullName,
+                LOGS_DIRECTORY);
+        }
+
+        const string LOGS_DIRECTORY = "logs";
+        const string RELEVANT_LOG_FILE_NAME = "unityplastic.relevant.log.txt";
+        const string DEBUG_LOG_FILE_NAME = "unityplastic.debug.log.txt";
+        const string LOG_CONFIGURATION = 
+@"<log4net>
+  <appender name=""RelevantInfoAppender"" type=""log4net.Appender.RollingFileAppender"">
+    <file value=""{0}"" />
+    <appendToFile value=""true"" />
+    <rollingStyle value=""Size"" />
+    <maxSizeRollBackups value=""10"" />
+    <maximumFileSize value=""2MB"" />
+    <layout type=""log4net.Layout.PatternLayout"">
+      <conversionPattern value=""%date %username %-5level %logger - %message%newline"" />
+    </layout>
+    <filter type=""log4net.Filter.LevelRangeFilter""><levelMin value=""INFO"" /><levelMax value=""FATAL"" /></filter>
+  </appender>
+
+  <appender name=""DebugAppender"" type=""log4net.Appender.RollingFileAppender"">
+    <file value=""{1}"" />
+    <appendToFile value=""true"" />
+    <rollingStyle value=""Size"" />
+    <maxSizeRollBackups value=""10"" />
+    <maximumFileSize value=""10MB"" />
+    <staticLogFileName value=""true"" />
+    <layout type=""log4net.Layout.PatternLayout"">
+      <conversionPattern value=""%date %username %-5level %logger - %message%newline"" />
+    </layout>
+  </appender>
+
+  <root>
+    <level value=""DEBUG"" />
+    <appender-ref ref=""RelevantInfoAppender"" />
+    <appender-ref ref=""DebugAppender"" />
+  </root>
+</log4net>
+";
+    }
+}
diff --git a/Editor/PlasticSCM/Configuration/WriteLogConfiguration.cs.meta b/Editor/PlasticSCM/Configuration/WriteLogConfiguration.cs.meta
new file mode 100644
index 0000000..86b9bd4
--- /dev/null
+++ b/Editor/PlasticSCM/Configuration/WriteLogConfiguration.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 332442c8f4f7b1943bb9e12fc97356e4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer.meta b/Editor/PlasticSCM/Developer.meta
new file mode 100644
index 0000000..f254a29
--- /dev/null
+++ b/Editor/PlasticSCM/Developer.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6079802724cc154ea5667c3a1e31d43
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/CheckinProgress.cs b/Editor/PlasticSCM/Developer/CheckinProgress.cs
new file mode 100644
index 0000000..b1353b7
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/CheckinProgress.cs
@@ -0,0 +1,83 @@
+using System;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.BaseCommands.CheckIn.Progress;
+using Codice.Client.Commands.CheckIn;
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow;
+
+namespace Unity.PlasticSCM.Editor.Developer
+{
+    internal class CheckinProgress
+    {
+        internal bool CancelPressed;
+
+        internal CheckinProgress(WorkspaceInfo wkInfo, PlasticGUIClient guiClient)
+        {
+            mWkInfo = wkInfo;
+            mGuiClient = guiClient;
+
+            mGuiClient.Progress.CanCancelProgress = true;
+
+            mProgressRender = new CheckinUploadProgressRender(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CheckinProgressMultiThreadUploading),
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CheckinProgressMultiThreadNumOfBlocks),
+                PlasticLocalization.GetString(PlasticLocalization.Name.CheckinProgressUploadingFiles),
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CheckinProgressUploadingFileData),
+                PlasticLocalization.GetString(PlasticLocalization.Name.CheckinProgressOf),
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.RemainingProgressMessage));
+        }
+
+        internal void Refresh(
+            CheckinStatus checkinStatus,
+            BuildProgressSpeedAndRemainingTime.ProgressData progressData)
+        {
+            if (checkinStatus == null)
+                return;
+
+            var progress = mGuiClient.Progress;
+
+            progress.ProgressHeader = checkinStatus.StatusString;
+
+            if (checkinStatus.Status >= EnumCheckinStatus.eciConfirming)
+                progress.CanCancelProgress = false;
+
+            if (checkinStatus.Status == EnumCheckinStatus.eciCancelling)
+                return;
+
+            int nowTicks = Environment.TickCount;
+
+            progress.TotalProgressMessage = mProgressRender.GetUploadSize(
+                checkinStatus.TransferredSize, checkinStatus.TotalSize, progressData);
+
+            progress.TotalProgressPercent = GetProgressBarPercent.ForTransfer(
+                checkinStatus.TransferredSize, checkinStatus.TotalSize) / 100f;
+
+            progress.ShowCurrentBlock = mProgressRender.
+                NeedShowCurrentBlockForCheckinStatus(checkinStatus, nowTicks);
+
+            string currentFileInfo = mProgressRender.GetCurrentFileInfo(
+                checkinStatus.CurrentCheckinBlock, mWkInfo.ClientPath);
+
+            progress.ProgressHeader = currentFileInfo;
+
+            float fileProgressBarValue = GetProgressBarPercent.ForTransfer(
+                 checkinStatus.CurrentCheckinBlock.UploadedSize,
+                 checkinStatus.CurrentCheckinBlock.BlockSize) / 100f;
+
+            progress.CurrentBlockProgressPercent = fileProgressBarValue;
+
+            progress.CurrentBlockProgressMessage = mProgressRender.GetCurrentBlockUploadSize(
+                 checkinStatus.CurrentCheckinBlock, nowTicks);
+        }
+
+        CheckinUploadProgressRender mProgressRender;
+        PlasticGUIClient mGuiClient;
+        WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/Developer/CheckinProgress.cs.meta b/Editor/PlasticSCM/Developer/CheckinProgress.cs.meta
new file mode 100644
index 0000000..79a532a
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/CheckinProgress.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7a0528634c1324f47b7e2e59266dfa4c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/GenericProgress.cs b/Editor/PlasticSCM/Developer/GenericProgress.cs
new file mode 100644
index 0000000..dae0298
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/GenericProgress.cs
@@ -0,0 +1,24 @@
+using PlasticGui.WorkspaceWindow;
+
+namespace Unity.PlasticSCM.Editor.Developer
+{
+    internal class GenericProgress
+    {
+        internal GenericProgress(PlasticGUIClient guiClient)
+        {
+            mGuiClient = guiClient;
+            mGuiClient.Progress.CanCancelProgress = false;
+        }
+
+        internal void RefreshProgress(ProgressData progressData)
+        {
+            var progress = mGuiClient.Progress;
+
+            progress.ProgressHeader = progressData.Status;
+            progress.TotalProgressMessage = progressData.Details;
+            progress.TotalProgressPercent = progressData.ProgressValue / 100f;
+        }
+
+        PlasticGUIClient mGuiClient;
+    }
+}
diff --git a/Editor/PlasticSCM/Developer/GenericProgress.cs.meta b/Editor/PlasticSCM/Developer/GenericProgress.cs.meta
new file mode 100644
index 0000000..41f8fbb
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/GenericProgress.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dc0cbec450c3bd54eb12276dcfdc27d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/IncomingChangesNotificationPanel.cs b/Editor/PlasticSCM/Developer/IncomingChangesNotificationPanel.cs
new file mode 100644
index 0000000..98dfc7e
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/IncomingChangesNotificationPanel.cs
@@ -0,0 +1,77 @@
+using UnityEditor;
+
+using PlasticGui.WorkspaceWindow;
+
+namespace Unity.PlasticSCM.Editor.Developer
+{
+    internal class IncomingChangesNotificationPanel :
+        IIncomingChangesNotificationPanel,
+        CheckIncomingChanges.IUpdateIncomingChanges
+    {
+        bool IIncomingChangesNotificationPanel.IsVisible
+        {
+            get { return mIsVisible; }
+        }
+
+        NotificationPanelData IIncomingChangesNotificationPanel.Data
+        {
+            get { return mPanelData; }
+        }
+
+        internal IncomingChangesNotificationPanel(
+            EditorWindow window)
+        {
+            mWindow = window;
+        }
+
+        void CheckIncomingChanges.IUpdateIncomingChanges.Hide()
+        {
+            mPanelData.Clear();
+
+            mIsVisible = false;
+
+            mWindow.Repaint();
+        }
+
+        void CheckIncomingChanges.IUpdateIncomingChanges.Show(
+            string infoText,
+            string actionText,
+            string tooltipText,
+            CheckIncomingChanges.Severity severity,
+            CheckIncomingChanges.Action action)
+        {
+            UpdateData(
+                mPanelData, infoText, actionText,
+                tooltipText, severity, action);
+
+            mIsVisible = true;
+
+            mWindow.Repaint();
+        }
+
+        static void UpdateData(
+            NotificationPanelData data,
+            string infoText,
+            string actionText,
+            string tooltipText,
+            CheckIncomingChanges.Severity severity,
+            CheckIncomingChanges.Action action)
+        {
+            data.HasUpdateAction =
+                action == CheckIncomingChanges.Action.Update;
+            data.InfoText = infoText;
+            data.ActionText = actionText;
+            data.TooltipText = tooltipText;
+            data.NotificationStyle =
+                severity == CheckIncomingChanges.Severity.Info ?
+                NotificationPanelData.StyleType.Green :
+                NotificationPanelData.StyleType.Red;
+        }
+
+        bool mIsVisible;
+
+        NotificationPanelData mPanelData = new NotificationPanelData();
+
+        EditorWindow mWindow;
+    }
+}
diff --git a/Editor/PlasticSCM/Developer/IncomingChangesNotificationPanel.cs.meta b/Editor/PlasticSCM/Developer/IncomingChangesNotificationPanel.cs.meta
new file mode 100644
index 0000000..f64f58e
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/IncomingChangesNotificationPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 977f370bb512cfb488436d69449d7381
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/ProgressOperationHandler.cs b/Editor/PlasticSCM/Developer/ProgressOperationHandler.cs
new file mode 100644
index 0000000..ce1e11b
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/ProgressOperationHandler.cs
@@ -0,0 +1,122 @@
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands.CheckIn;
+using Codice.Client.Common;
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow;
+
+namespace Unity.PlasticSCM.Editor.Developer
+{
+    internal class ProgressOperationHandler
+    {
+        internal ProgressOperationHandler(WorkspaceInfo wkInfo, PlasticGUIClient guiClient)
+        {
+            mWkInfo = wkInfo;
+            mGuiClient = guiClient;
+        }
+
+        internal void Update(double elapsedSeconds)
+        {
+            if (mUpdateProgress == null)
+                return;
+
+            mSecondsSinceLastProgressUpdate += elapsedSeconds;
+            if (mSecondsSinceLastProgressUpdate > UPDATE_INTERVAL_SECONDS)
+            {
+                mUpdateProgress.OnUpdateProgress();
+                mSecondsSinceLastProgressUpdate -= UPDATE_INTERVAL_SECONDS;
+            }
+        }
+
+        internal bool CheckOperationInProgress()
+        {
+            if (IsOperationInProgress())
+            {
+                GuiMessage.ShowInformation(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.OperationRunning),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.OperationInProgress));
+                return true;
+            }
+
+            return false;
+        }
+
+        internal bool IsOperationInProgress()
+        {
+            return mProgress != null
+                || mUpdateProgress != null
+                || mCheckinProgress != null;
+        }
+
+        internal void ShowProgress()
+        {
+            mProgress = new GenericProgress(mGuiClient);
+        }
+
+        internal void RefreshProgress(ProgressData progressData)
+        {
+            mProgress.RefreshProgress(progressData);
+        }
+
+        internal void EndProgress()
+        {
+            mProgress = null;
+            mGuiClient.Progress.ResetProgress();
+            mGuiClient.RequestRepaint();
+        }
+
+        internal void ShowUpdateProgress(string title, UpdateNotifier notifier)
+        {
+            mUpdateProgress = new UpdateProgress(notifier, mWkInfo.ClientPath, title, mGuiClient);
+            mUpdateProgress.OnUpdateProgress();
+            mSecondsSinceLastProgressUpdate = 0;
+        }
+
+        internal void ShowCheckinProgress()
+        {
+            mCheckinProgress = new CheckinProgress(mWkInfo, mGuiClient);
+        }
+
+        internal void RefreshCheckinProgress(
+            CheckinStatus checkinStatus,
+            BuildProgressSpeedAndRemainingTime.ProgressData progressData)
+        {
+            mCheckinProgress.Refresh(checkinStatus, progressData);
+        }
+
+        internal void CancelCheckinProgress()
+        {
+            mCheckinProgress.CancelPressed = true;
+        }
+
+        internal void EndUpdateProgress()
+        {
+            mUpdateProgress = null;
+            mGuiClient.Progress.ResetProgress();
+            mGuiClient.RequestRepaint();
+        }
+
+        internal void EndCheckinProgress()
+        {
+            mCheckinProgress = null;
+            mGuiClient.Progress.ResetProgress();
+            mGuiClient.RequestRepaint();
+        }
+
+        internal bool HasCheckinCancelled()
+        {
+            return mCheckinProgress.CancelPressed;
+        }
+
+        double mSecondsSinceLastProgressUpdate = 0;
+
+        GenericProgress mProgress;
+        UpdateProgress mUpdateProgress;
+        CheckinProgress mCheckinProgress;
+        WorkspaceInfo mWkInfo;
+
+        PlasticGUIClient mGuiClient;
+
+        const double UPDATE_INTERVAL_SECONDS = 0.5;
+    }
+}
diff --git a/Editor/PlasticSCM/Developer/ProgressOperationHandler.cs.meta b/Editor/PlasticSCM/Developer/ProgressOperationHandler.cs.meta
new file mode 100644
index 0000000..d4a362c
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/ProgressOperationHandler.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f1b80531a496e644abedd795c21274cb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/UpdateProgress.cs b/Editor/PlasticSCM/Developer/UpdateProgress.cs
new file mode 100644
index 0000000..7a034b9
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateProgress.cs
@@ -0,0 +1,47 @@
+using System;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using PlasticGui.WorkspaceWindow;
+using PlasticGui.WorkspaceWindow.Update;
+
+namespace Unity.PlasticSCM.Editor.Developer
+{
+    internal class UpdateProgress
+    {
+        internal UpdateProgress(
+            UpdateNotifier notifier, string wkPath, string title,
+            PlasticGUIClient guiClient)
+        {
+            mNotifier = notifier;
+            mWkPath = wkPath;
+            mGuiClient = guiClient;
+
+            mProgressData = new BuildProgressSpeedAndRemainingTime.ProgressData(DateTime.Now);
+
+            mGuiClient.Progress.ProgressHeader = title;
+            mGuiClient.Progress.CanCancelProgress = false;
+        }
+
+        internal void OnUpdateProgress()
+        {
+            var progress = mGuiClient.Progress;
+
+            progress.ProgressHeader = UpdateProgressRender.FixNotificationPath(
+                mWkPath, mNotifier.GetNotificationMessage());
+
+            UpdateOperationStatus status = mNotifier.GetUpdateStatus();
+
+            progress.TotalProgressMessage = UpdateProgressRender.GetProgressString(
+                status, mProgressData);
+
+            progress.TotalProgressPercent = GetProgressBarPercent.ForTransfer(
+                status.UpdatedSize, status.TotalSize) / 100f;
+        }
+
+        readonly BuildProgressSpeedAndRemainingTime.ProgressData mProgressData;
+        readonly PlasticGUIClient mGuiClient;
+        readonly string mWkPath;
+        readonly UpdateNotifier mNotifier;
+    }
+}
diff --git a/Editor/PlasticSCM/Developer/UpdateProgress.cs.meta b/Editor/PlasticSCM/Developer/UpdateProgress.cs.meta
new file mode 100644
index 0000000..65dc8a6
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateProgress.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ce652d891ad5ed540b0d6e474d00130c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/UpdateReport.meta b/Editor/PlasticSCM/Developer/UpdateReport.meta
new file mode 100644
index 0000000..37e1ee5
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateReport.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cca926c65e360cf4f8637f7c853a7513
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportDialog.cs b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportDialog.cs
new file mode 100644
index 0000000..2e281af
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportDialog.cs
@@ -0,0 +1,273 @@
+using System.Collections;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.Update;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Developer.UpdateReport
+{
+    internal class UpdateReportDialog :
+        PlasticDialog,
+        IUpdateReportDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 810, 385);
+            }
+        }
+
+        internal static ResponseType ShowReportDialog(
+            WorkspaceInfo wkInfo,
+            IList reportLines,
+            EditorWindow parentWindow)
+        {
+            UpdateReportDialog dialog = Create(
+                wkInfo,
+                reportLines,
+                new ProgressControlsForDialogs());
+
+            return dialog.RunModal(parentWindow);
+        }
+
+        protected override void SaveSettings()
+        {
+            TreeHeaderSettings.Save(mPathsListView.multiColumnHeader.state,
+                UnityConstants.DEVELOPER_UPDATE_REPORT_TABLE_SETTINGS_NAME);
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(PlasticLocalization.Name.UpdateResultsTitle));
+
+            Paragraph(PlasticLocalization.GetString(PlasticLocalization.Name.UpdateResultsError));
+
+            DoListArea(
+                mPathsListView,
+                mErrorDetailsSplitterState);
+
+            GUILayout.Space(10);
+
+            DoSelectAllArea();
+
+            GUILayout.BeginHorizontal();
+            GUILayout.Space(4);
+            DrawProgressForDialogs.For(
+                mProgressControls.ProgressData);
+            GUILayout.Space(4);
+            GUILayout.EndHorizontal();
+
+            GUILayout.Space(2);
+
+            DoButtonsArea(mIsAnyLineChecked);
+
+            mProgressControls.ForcedUpdateProgress(this);
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.UpdateResultsTitle);
+        }
+
+        void IUpdateReportDialog.Reload()
+        {
+            SetReportLines(mReportLines);
+        }
+
+        void OnCheckedReportLineChanged()
+        {
+            mIsAnyLineChecked =
+                mPathsListView.IsAnyLineChecked();
+            mAreAllLinesChecked =
+                mPathsListView.AreAllLinesChecked();
+        }
+
+        void DoListArea(
+            UpdateReportListView errorsListView,
+            object splitterState)
+        {
+            EditorGUILayout.BeginVertical();
+            PlasticSplitterGUILayout.BeginHorizontalSplit(splitterState);
+
+            DoErrorsListViewArea(errorsListView);
+            DoErrorDetailsTextArea(errorsListView.GetSelectedError());
+
+            PlasticSplitterGUILayout.EndHorizontalSplit();
+            EditorGUILayout.EndVertical();
+        }
+
+        static void DoErrorsListViewArea(
+            UpdateReportListView errorsListView)
+        {
+            Rect treeRect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            errorsListView.OnGUI(treeRect);
+        }
+
+        void DoErrorDetailsTextArea(ReportLine selectedReportLine)
+        {
+            string errorDetailsText = selectedReportLine == null ?
+                string.Empty : selectedReportLine.Message;
+
+            EditorGUILayout.BeginVertical();
+
+            GUILayout.Space(8);
+            GUILayout.Label(PlasticLocalization.GetString(PlasticLocalization.Name.ProblemColumn));
+
+            mErrorDetailsScrollPosition = GUILayout.BeginScrollView(
+                mErrorDetailsScrollPosition);
+
+            GUILayout.TextArea(
+                errorDetailsText, UnityStyles.TextFieldWithWrapping,
+                GUILayout.ExpandHeight(true));
+
+            GUILayout.EndScrollView();
+
+            EditorGUILayout.EndVertical();
+        }
+
+        void DoSelectAllArea()
+        {
+            bool toggleValue = GUILayout.Toggle(
+                mAreAllLinesChecked,
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.SelectAll));
+
+            if (toggleValue != mAreAllLinesChecked && toggleValue)
+            {
+                mPathsListView.CheckAllLines();
+                return;
+            }
+
+            if (toggleValue != mAreAllLinesChecked && !toggleValue)
+            {
+                mPathsListView.UnCheckAllLines();
+                return;
+            }
+        }
+
+        void DoButtonsArea(bool areUpdateButtonsEneabled)
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                DoRetryUpdateButton(areUpdateButtonsEneabled);
+                DoUpdateForcedButton(areUpdateButtonsEneabled);
+
+                GUILayout.FlexibleSpace();
+
+                DoCloseButton();
+            }
+        }
+
+        void DoRetryUpdateButton(bool isEnabled)
+        {
+            GUI.enabled = isEnabled;
+
+            bool pressed = NormalButton(PlasticLocalization.GetString(
+                PlasticLocalization.Name.RetryUpdate));
+
+            GUI.enabled = true;
+
+            if (!pressed)
+                return;
+
+            SelectiveUpdateOperation.SelectiveUpdate(
+                mWkInfo, mReportLines, mPathsListView.GetCheckedLines(),
+                UpdateFlags.None, this, mProgressControls);
+        }
+
+        void DoUpdateForcedButton(bool isEnabled)
+        {
+            GUI.enabled = isEnabled;
+
+            bool pressed = NormalButton(PlasticLocalization.GetString(
+                PlasticLocalization.Name.UpdateForced));
+
+            GUI.enabled = true;
+
+            if (!pressed)
+                return;
+
+            SelectiveUpdateOperation.SelectiveUpdate(
+                mWkInfo, mReportLines, mPathsListView.GetCheckedLines(),
+                UpdateFlags.Forced, this, mProgressControls);
+        }
+
+        void DoCloseButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                PlasticLocalization.Name.CloseButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        static UpdateReportDialog Create(
+            WorkspaceInfo wkInfo,
+            IList reportLines,
+            ProgressControlsForDialogs progressControls)
+        {
+            var instance = CreateInstance<UpdateReportDialog>();
+            instance.mWkInfo = wkInfo;
+            instance.mReportLines = reportLines;
+            instance.mProgressControls = progressControls;
+            instance.mEscapeKeyAction = instance.CloseButtonAction;
+            instance.BuildComponenets(wkInfo);
+            instance.SetReportLines(reportLines);
+            return instance;
+        }
+
+        void SetReportLines(IList reportLines)
+        {
+            mReportLines = reportLines;
+
+            mPathsListView.BuildModel(reportLines);
+            mPathsListView.Reload();
+            mAreAllLinesChecked = false;
+        }
+
+        void BuildComponenets(WorkspaceInfo wkInfo)
+        {
+            mErrorDetailsSplitterState = PlasticSplitterGUILayout.InitSplitterState(
+                new float[] { 0.50f, 0.50f },
+                new int[] { 100, 100 },
+                new int[] { 100000, 100000 }
+            );
+
+            UpdateReportListHeaderState errorsListHeaderState =
+                UpdateReportListHeaderState.GetDefault();
+            TreeHeaderSettings.Load(errorsListHeaderState,
+                UnityConstants.DEVELOPER_UPDATE_REPORT_TABLE_SETTINGS_NAME,
+                UnityConstants.UNSORT_COLUMN_ID);
+
+            mPathsListView = new UpdateReportListView(
+                wkInfo,
+                errorsListHeaderState,
+                OnCheckedReportLineChanged);
+
+            mPathsListView.Reload();
+        }
+
+        bool mIsAnyLineChecked = false;
+        bool mAreAllLinesChecked = false;
+        UpdateReportListView mPathsListView;
+
+        object mErrorDetailsSplitterState;
+        Vector2 mErrorDetailsScrollPosition;
+
+        WorkspaceInfo mWkInfo;
+        IList mReportLines;
+        ProgressControlsForDialogs mProgressControls;
+    }
+}
diff --git a/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportDialog.cs.meta b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportDialog.cs.meta
new file mode 100644
index 0000000..9b8afeb
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3cc230fb0050a994480d907e02d3508b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportLineListViewItem.cs b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportLineListViewItem.cs
new file mode 100644
index 0000000..ec90e92
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportLineListViewItem.cs
@@ -0,0 +1,19 @@
+using UnityEditor.IMGUI.Controls;
+
+using Codice.Client.BaseCommands;
+
+namespace Unity.PlasticSCM.Editor.Developer.UpdateReport
+{
+    internal class UpdateReportLineListViewItem : TreeViewItem
+    {
+        internal ReportLine ReportLine { get; private set; }
+
+        internal UpdateReportLineListViewItem(int id, ReportLine reportLine)
+            : base(id, 0)
+        {
+            ReportLine = reportLine;
+
+            displayName = reportLine.ItemPath;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportLineListViewItem.cs.meta b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportLineListViewItem.cs.meta
new file mode 100644
index 0000000..476a47d
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportLineListViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 146c16184e337574f9f3baf6d467907a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListHeaderState.cs b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListHeaderState.cs
new file mode 100644
index 0000000..385247f
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListHeaderState.cs
@@ -0,0 +1,71 @@
+using System;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Developer.UpdateReport
+{
+    internal enum ErrorsListColumn
+    {
+        Path,
+    }
+
+    [Serializable]
+    internal class UpdateReportListHeaderState : MultiColumnHeaderState, ISerializationCallbackReceiver
+    {
+        internal static UpdateReportListHeaderState GetDefault()
+        {
+            return new UpdateReportListHeaderState(BuildColumns());
+        }
+
+        static string GetColumnName(ErrorsListColumn column)
+        {
+            switch (column)
+            {
+                case ErrorsListColumn.Path:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn);
+                default:
+                    return null;
+            }
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            if (mHeaderTitles != null)
+                TreeHeaderColumns.SetTitles(columns, mHeaderTitles);
+        }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+        }
+
+        static Column[] BuildColumns()
+        {
+            return new Column[]
+                {
+                    new Column()
+                    {
+                        width = 605,
+                        headerContent = new GUIContent(
+                            GetColumnName(ErrorsListColumn.Path)),
+                        minWidth = 200,
+                        allowToggleVisibility = false,
+                        canSort = false
+                    }
+                };
+        }
+
+        UpdateReportListHeaderState(Column[] columns)
+            : base(columns)
+        {
+            if (mHeaderTitles == null)
+                mHeaderTitles = TreeHeaderColumns.GetTitles(columns);
+        }
+
+        [SerializeField]
+        string[] mHeaderTitles;
+    }
+}
diff --git a/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListHeaderState.cs.meta b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListHeaderState.cs.meta
new file mode 100644
index 0000000..05ae03f
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListHeaderState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5b37b989e50b35043bba89d7d660e31e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListView.cs b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListView.cs
new file mode 100644
index 0000000..ac1d725
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListView.cs
@@ -0,0 +1,270 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Common;
+using Codice.CM.Common;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Developer.UpdateReport
+{
+    internal class UpdateReportListView : TreeView
+    {
+        internal UpdateReportListView(
+            WorkspaceInfo wkInfo,
+            UpdateReportListHeaderState headerState,
+            Action onCheckedReportLineChanged)
+            : base(new TreeViewState())
+        {
+            mWkInfo = wkInfo;
+            mOnCheckedReportLineChanged = onCheckedReportLineChanged;
+
+            multiColumnHeader = new MultiColumnHeader(headerState);
+            multiColumnHeader.canSort = false;
+
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+        }
+
+        internal List<ReportLine> GetCheckedLines()
+        {
+            List<ReportLine> result = new List<ReportLine>();
+
+            foreach (UpdateReportLineListViewItem item in mCheckedLines)
+                result.Add(item.ReportLine);
+
+            return result;
+        }
+
+        internal bool IsAnyLineChecked()
+        {
+            return mCheckedLines.Count > 0;
+        }
+
+        internal bool AreAllLinesChecked()
+        {
+            if (mReportLines.Count == 0)
+                return false;
+
+            return mCheckedLines.Count == mReportLines.Count;
+        }
+
+        internal void CheckAllLines()
+        {
+            mCheckedLines.Clear();
+
+            foreach (UpdateReportLineListViewItem row in mRows)
+            {
+                mCheckedLines.Add(row);
+            }
+
+            mOnCheckedReportLineChanged();
+        }
+
+        internal void UnCheckAllLines()
+        {
+            mCheckedLines.Clear();
+            mOnCheckedReportLineChanged();
+        }
+
+        internal void BuildModel(IList reportLines)
+        {
+            mReportLines = reportLines;
+            mCheckedLines.Clear();
+            mOnCheckedReportLineChanged();
+        }
+
+        internal ReportLine GetSelectedError()
+        {
+            List<ReportLine> selectedErrors = GetSelectedErrors(this);
+
+            if (selectedErrors.Count != 1)
+                return null;
+
+            return selectedErrors[0];
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(
+            TreeViewItem rootItem)
+        {
+            RegenerateRows(
+                this, mReportLines, rootItem, mRows);
+
+            return mRows;
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            if (args.item is UpdateReportLineListViewItem)
+            {
+                UpdateReportListViewItemGUI(
+                    mWkInfo.ClientPath,
+                    (UpdateReportLineListViewItem)args.item,
+                    args,
+                    rowHeight,
+                    mReportLines.Count,
+                    mOnCheckedReportLineChanged,
+                    mCheckedLines);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        static List<ReportLine> GetSelectedErrors(
+            UpdateReportListView listView)
+        {
+            List<ReportLine> result = new List<ReportLine>();
+
+            IList<int> selectedIds = listView.GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (UpdateReportLineListViewItem treeViewItem in
+                listView.FindRows(selectedIds))
+            {
+                result.Add(treeViewItem.ReportLine);
+            }
+
+            return result;
+        }
+
+        static void RegenerateRows(
+            UpdateReportListView listView,
+            IList reportLines,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            ClearRows(rootItem, rows);
+
+            if (reportLines.Count == 0)
+                return;
+
+            for (int i = 0; i < reportLines.Count; i++)
+            {
+                UpdateReportLineListViewItem errorListViewItem =
+                    new UpdateReportLineListViewItem(i + 1, (ReportLine)reportLines[i]);
+
+                rootItem.AddChild(errorListViewItem);
+                rows.Add(errorListViewItem);
+            }
+
+            listView.SetSelection(new List<int> { 1 });
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static void UpdateReportListViewItemGUI(
+            string wkPath,
+            UpdateReportLineListViewItem item,
+            RowGUIArgs args,
+            float rowHeight,
+            int totalLinesCount,
+            Action onCheckedReportLineChanged,
+            HashSet<UpdateReportLineListViewItem> checkedLines)
+        {
+            for (int visibleColumnIdx = 0; visibleColumnIdx < args.GetNumVisibleColumns(); visibleColumnIdx++)
+            {
+                Rect cellRect = args.GetCellRect(visibleColumnIdx);
+
+                ErrorsListColumn column =
+                    (ErrorsListColumn)args.GetColumn(visibleColumnIdx);
+
+                UpdateReportListViewItemCellGUI(
+                    cellRect,
+                    wkPath,
+                    item,
+                    column,
+                    rowHeight,
+                    args.selected,
+                    args.focused,
+                    totalLinesCount,
+                    onCheckedReportLineChanged,
+                    checkedLines);
+            }
+        }
+
+        static void UpdateReportListViewItemCellGUI(
+            Rect rect,
+            string wkPath,
+            UpdateReportLineListViewItem item,
+            ErrorsListColumn column,
+            float rowHeight,
+            bool isSelected,
+            bool isFocused,
+            int totalLinesCount,
+            Action onCheckedReportLineChanged,
+            HashSet<UpdateReportLineListViewItem> checkedLines)
+        {
+            string label = WorkspacePath.GetWorkspaceRelativePath(
+                wkPath,
+                item.ReportLine.ItemPath);
+
+            bool wasChecked = checkedLines.Contains(item);
+            bool isChecked = DrawTreeViewItem.ForCheckableItemCell(
+                rect,
+                rowHeight,
+                0,
+                null,
+                null,
+                label,
+                isSelected,
+                isFocused,
+                false,
+                wasChecked);
+
+            if (wasChecked != isChecked)
+            {
+                UpdateCheckedState(checkedLines, item, isChecked);
+                onCheckedReportLineChanged();
+            }
+        }
+
+        static void UpdateCheckedState(
+            HashSet<UpdateReportLineListViewItem> checkedLines,
+            UpdateReportLineListViewItem item,
+            bool isChecked)
+        {
+            if (isChecked)
+            {
+                checkedLines.Add(item);
+                return;
+            }
+
+            checkedLines.Remove(item);
+        }
+
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+        IList mReportLines = new ArrayList();
+
+        HashSet<UpdateReportLineListViewItem> mCheckedLines =
+            new HashSet<UpdateReportLineListViewItem>();
+
+        readonly WorkspaceInfo mWkInfo;
+        readonly Action mOnCheckedReportLineChanged;
+    }
+}
diff --git a/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListView.cs.meta b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListView.cs.meta
new file mode 100644
index 0000000..4e94f05
--- /dev/null
+++ b/Editor/PlasticSCM/Developer/UpdateReport/UpdateReportListView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e8bf7425cfbdd094da5dc809a5eaa8ff
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/DrawGuiModeSwitcher.cs b/Editor/PlasticSCM/DrawGuiModeSwitcher.cs
new file mode 100644
index 0000000..fb33553
--- /dev/null
+++ b/Editor/PlasticSCM/DrawGuiModeSwitcher.cs
@@ -0,0 +1,71 @@
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Unity.PlasticSCM.Editor.Views;
+using Unity.PlasticSCM.Editor.Views.PendingChanges;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class DrawGuiModeSwitcher
+    {
+        internal static void ForMode(
+            bool isGluonMode,
+            PlasticGUIClient plasticClient,
+            TreeView changesTreeView,
+            EditorWindow editorWindow)
+        {
+            GUI.enabled = !plasticClient.IsOperationInProgress();
+
+            EditorGUI.BeginChangeCheck();
+
+            GuiMode currentMode = isGluonMode ?
+                GuiMode.GluonMode : GuiMode.DeveloperMode;
+
+            GuiMode selectedMode = (GuiMode)EditorGUILayout.EnumPopup(
+                currentMode,
+                EditorStyles.toolbarDropDown,
+                GUILayout.Width(100));
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                SwitchGuiModeIfUserWants(
+                    plasticClient, currentMode, selectedMode,
+                    changesTreeView, editorWindow);
+            }
+
+            GUI.enabled = true;
+        }
+
+        static void SwitchGuiModeIfUserWants(
+            PlasticGUIClient plasticClient,
+            GuiMode currentMode, GuiMode selectedMode,
+            TreeView changesTreeView,
+            EditorWindow editorWindow)
+        {
+            if (currentMode == selectedMode)
+                return;
+
+            bool userConfirmed = SwitchModeConfirmationDialog.SwitchMode(
+                currentMode == GuiMode.GluonMode, editorWindow);
+
+            if (!userConfirmed)
+                return;
+
+            bool isGluonMode = selectedMode == GuiMode.GluonMode;
+
+            LaunchOperation.UpdateWorkspaceForMode(
+                isGluonMode, plasticClient);
+
+            PendingChangesTreeHeaderState.SetMode(
+                changesTreeView.multiColumnHeader.state,
+                isGluonMode);
+        }
+
+        enum GuiMode
+        {
+            DeveloperMode,
+            GluonMode
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/DrawGuiModeSwitcher.cs.meta b/Editor/PlasticSCM/DrawGuiModeSwitcher.cs.meta
new file mode 100644
index 0000000..472731f
--- /dev/null
+++ b/Editor/PlasticSCM/DrawGuiModeSwitcher.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 14c7ad7d838cc1d4691f5d9ca504f0ac
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/DrawIncomingChangesNotificationPanel.cs b/Editor/PlasticSCM/DrawIncomingChangesNotificationPanel.cs
new file mode 100644
index 0000000..c575a94
--- /dev/null
+++ b/Editor/PlasticSCM/DrawIncomingChangesNotificationPanel.cs
@@ -0,0 +1,151 @@
+using UnityEditor;
+using UnityEngine;
+
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.Gluon;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+using Unity.PlasticSCM.Editor.UI;
+
+using GluonShowIncomingChanges = PlasticGui.Gluon.WorkspaceWindow.ShowIncomingChanges;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal class NotificationPanelData
+    {
+        internal enum StyleType
+        {
+            None,
+            Red,
+            Green,
+        }
+
+        internal bool HasUpdateAction;
+        internal string InfoText;
+        internal string ActionText;
+        internal string TooltipText;
+        internal StyleType NotificationStyle;
+
+        internal void Clear()
+        {
+            HasUpdateAction = false;
+            InfoText = string.Empty;
+            ActionText = string.Empty;
+            TooltipText = string.Empty;
+            NotificationStyle = StyleType.None;
+        }
+    }
+
+    interface IIncomingChangesNotificationPanel
+    {
+        bool IsVisible
+        {
+            get;
+        }
+
+        NotificationPanelData Data
+        {
+            get;
+        }
+    }
+
+    internal static class DrawIncomingChangesNotificationPanel
+    {
+        internal static void ForMode(
+            WorkspaceInfo workspaceInfo,
+            PlasticGUIClient plasticClient,
+            IMergeViewLauncher mergeViewLauncher,
+            IGluonViewSwitcher gluonSwitcher,
+            bool isGluonMode,
+            bool isVisible,
+            NotificationPanelData notificationPanelData)
+        {
+            if (!isVisible)
+                return;
+
+            GUIContent labelContent = new GUIContent(
+                notificationPanelData.InfoText, notificationPanelData.TooltipText);
+            GUIContent buttonContent = new GUIContent(
+                notificationPanelData.ActionText, notificationPanelData.TooltipText);
+
+            float panelWidth = GetPanelWidth(
+                labelContent, buttonContent,
+                UnityStyles.Notification.Label, EditorStyles.miniButton);
+
+            EditorGUILayout.BeginHorizontal(
+                GetStyle(notificationPanelData.NotificationStyle),
+                GUILayout.Width(panelWidth));
+
+            GUILayout.Label(labelContent, UnityStyles.Notification.Label);
+
+            DoActionButton(
+                workspaceInfo, plasticClient,
+                mergeViewLauncher, gluonSwitcher, isGluonMode,
+                notificationPanelData.HasUpdateAction,
+                buttonContent, EditorStyles.miniButton);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoActionButton(
+            WorkspaceInfo workspaceInfo,
+            PlasticGUIClient plasticClient,
+            IMergeViewLauncher mergeViewLauncher,
+            IGluonViewSwitcher gluonSwitcher,
+            bool isGluonMode,
+            bool isUpdateAction,
+            GUIContent buttonContent,
+            GUIStyle buttonStyle)
+        {
+            if (!GUILayout.Button(
+                    buttonContent, buttonStyle,
+                    GUILayout.ExpandHeight(true),
+                    GUILayout.MinWidth(40)))
+                return;
+
+            if (isUpdateAction)
+            {
+                plasticClient.UpdateWorkspace();
+                return;
+            }
+
+            ShowIncomingChangesForMode(
+                workspaceInfo, mergeViewLauncher,
+                gluonSwitcher, isGluonMode);
+        }
+
+        static void ShowIncomingChangesForMode(
+            WorkspaceInfo workspaceInfo,
+            IMergeViewLauncher mergeViewLauncher,
+            IGluonViewSwitcher gluonSwitcher,
+            bool isGluonMode)
+        {
+            if (isGluonMode)
+            {
+                GluonShowIncomingChanges.FromNotificationBar(
+                    workspaceInfo, gluonSwitcher);
+                return;
+            }
+
+            ShowIncomingChanges.FromNotificationBar(
+                workspaceInfo, mergeViewLauncher);
+        }
+
+        static GUIStyle GetStyle(
+            NotificationPanelData.StyleType styleType)
+        {
+            if (styleType == NotificationPanelData.StyleType.Red)
+                return UnityStyles.Notification.RedNotification;
+
+            return UnityStyles.Notification.GreenNotification;
+        }
+
+        static float GetPanelWidth(
+            GUIContent labelContent, GUIContent buttonContent,
+            GUIStyle labelStyle, GUIStyle buttonStyle)
+        {
+            return labelStyle.CalcSize(labelContent).x +
+                buttonStyle.CalcSize(buttonContent).x + 12;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/DrawIncomingChangesNotificationPanel.cs.meta b/Editor/PlasticSCM/DrawIncomingChangesNotificationPanel.cs.meta
new file mode 100644
index 0000000..eebed3e
--- /dev/null
+++ b/Editor/PlasticSCM/DrawIncomingChangesNotificationPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1431159b15791b249b8f8917f2c50ec6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/EnumExtensions.cs b/Editor/PlasticSCM/EnumExtensions.cs
new file mode 100644
index 0000000..ea2aaab
--- /dev/null
+++ b/Editor/PlasticSCM/EnumExtensions.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class EnumExtensions
+    {
+        internal static bool HasFlag(this Enum variable, Enum value)
+        {
+            if (variable.GetType() != value.GetType())
+                throw new ArgumentException(
+                    "The checked flag is not from the same type as the checked variable.");
+
+            Convert.ToUInt64(value);
+            ulong num = Convert.ToUInt64(value);
+            ulong num2 = Convert.ToUInt64(variable);
+
+            return (num2 & num) == num;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/EnumExtensions.cs.meta b/Editor/PlasticSCM/EnumExtensions.cs.meta
new file mode 100644
index 0000000..07ea805
--- /dev/null
+++ b/Editor/PlasticSCM/EnumExtensions.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f032fd1e0068a2642abd4fe8e1fd4241
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/FindWorkspace.cs b/Editor/PlasticSCM/FindWorkspace.cs
new file mode 100644
index 0000000..22e5bce
--- /dev/null
+++ b/Editor/PlasticSCM/FindWorkspace.cs
@@ -0,0 +1,41 @@
+using System.IO;
+
+using Codice.Client.Common;
+using Codice.CM.Common;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class FindWorkspace
+    {
+        internal static string PathForApplicationPath(string path)
+        {
+            return FindWorkspacePath(
+                path, ClientConfig.Get().GetWkConfigDir());
+        }
+
+        internal static WorkspaceInfo InfoForApplicationPath(
+            string path, IPlasticAPI plasticApi)
+        {
+            string wkPath = PathForApplicationPath(path);
+
+            if (string.IsNullOrEmpty(wkPath))
+                return null;
+
+            return plasticApi.GetWorkspaceFromPath(wkPath);
+        }
+
+        static string FindWorkspacePath(string path, string wkConfigDir)
+        {
+            while (!string.IsNullOrEmpty(path))
+            {
+                if (Directory.Exists(Path.Combine(path, wkConfigDir)))
+                    return path;
+
+                path = Path.GetDirectoryName(path);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/FindWorkspace.cs.meta b/Editor/PlasticSCM/FindWorkspace.cs.meta
new file mode 100644
index 0000000..d16d3ac
--- /dev/null
+++ b/Editor/PlasticSCM/FindWorkspace.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 699b33b09648b5641b12384ac691546d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/GetRelativePath.cs b/Editor/PlasticSCM/GetRelativePath.cs
new file mode 100644
index 0000000..eba12cc
--- /dev/null
+++ b/Editor/PlasticSCM/GetRelativePath.cs
@@ -0,0 +1,26 @@
+using System;
+
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class GetRelativePath
+    {
+        internal static string ToApplication(string path)
+        {
+            Uri relativeToUri = new Uri(Application.dataPath);
+            Uri pathUri = new Uri(FixVolumeLetterPath(path));
+
+            return Uri.UnescapeDataString(
+                relativeToUri.MakeRelativeUri(pathUri).ToString());
+        }
+
+        static string FixVolumeLetterPath(string path)
+        {
+            string volumeLetter = new string(new char[] { path[0] });
+            volumeLetter = volumeLetter.ToUpperInvariant();
+
+            return string.Concat(volumeLetter, path.Substring(1));
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/GetRelativePath.cs.meta b/Editor/PlasticSCM/GetRelativePath.cs.meta
new file mode 100644
index 0000000..ef5eaec
--- /dev/null
+++ b/Editor/PlasticSCM/GetRelativePath.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4af85446b06bf694a966f280918beb31
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon.meta b/Editor/PlasticSCM/Gluon.meta
new file mode 100644
index 0000000..1fec4a0
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 247bccd1e820aae42b0c93b3f77ce6e8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon/CheckinProgress.cs b/Editor/PlasticSCM/Gluon/CheckinProgress.cs
new file mode 100644
index 0000000..4029e1f
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/CheckinProgress.cs
@@ -0,0 +1,26 @@
+using GluonGui.WorkspaceWindow.Views.Checkin.Operations;
+
+namespace Unity.PlasticSCM.Editor.Gluon
+{
+    internal class CheckinProgress
+    {
+        internal CheckinProgress(PlasticGUIClient guiClient)
+        {
+            mGuiClient = guiClient;
+        }
+
+        internal void Refresh(CheckinProgressData progress)
+        {
+            mGuiClient.Progress.ProgressHeader = progress.ProgressText;
+
+            mGuiClient.Progress.TotalProgressMessage = progress.TotalProgressText;
+            mGuiClient.Progress.TotalProgressPercent = ((double)progress.TotalProgressValue) / 100;
+
+            mGuiClient.Progress.ShowCurrentBlock = progress.bShowCurrentBlock;
+            mGuiClient.Progress.CurrentBlockProgressMessage = progress.CurrentBlockText;
+            mGuiClient.Progress.CurrentBlockProgressPercent = ((double)progress.CurrentBlockProgressValue) / 100;
+        }
+
+        PlasticGUIClient mGuiClient;
+    }
+}
diff --git a/Editor/PlasticSCM/Gluon/CheckinProgress.cs.meta b/Editor/PlasticSCM/Gluon/CheckinProgress.cs.meta
new file mode 100644
index 0000000..32afed9
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/CheckinProgress.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 201d30422af8ea34193a59b4254b8663
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon/IncomingChangesNotificationPanel.cs b/Editor/PlasticSCM/Gluon/IncomingChangesNotificationPanel.cs
new file mode 100644
index 0000000..e527eb4
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/IncomingChangesNotificationPanel.cs
@@ -0,0 +1,74 @@
+using UnityEditor;
+
+using PlasticGui.Gluon.WorkspaceWindow;
+
+namespace Unity.PlasticSCM.Editor.Gluon
+{
+    internal class IncomingChangesNotificationPanel :
+        IIncomingChangesNotificationPanel,
+        CheckIncomingChanges.IUpdateIncomingChanges
+    {
+        bool IIncomingChangesNotificationPanel.IsVisible
+        {
+            get { return mIsVisible; }
+        }
+
+        NotificationPanelData IIncomingChangesNotificationPanel.Data
+        {
+            get { return mPanelData; }
+        }
+
+        internal IncomingChangesNotificationPanel(
+            EditorWindow window)
+        {
+            mWindow = window;
+        }
+
+        void CheckIncomingChanges.IUpdateIncomingChanges.Hide()
+        {
+            mPanelData.Clear();
+
+            mIsVisible = false;
+
+            mWindow.Repaint();
+        }
+
+        void CheckIncomingChanges.IUpdateIncomingChanges.Show(
+            string infoText,
+            string actionText,
+            string tooltipText,
+            CheckIncomingChanges.Severity severity)
+        {
+            UpdateData(
+                mPanelData, infoText, actionText,
+                tooltipText, severity);
+
+            mIsVisible = true;
+
+            mWindow.Repaint();
+        }
+
+        static void UpdateData(
+            NotificationPanelData data,
+            string infoText,
+            string actionText,
+            string tooltipText,
+            CheckIncomingChanges.Severity severity)
+        {
+            data.HasUpdateAction = false;
+            data.InfoText = infoText;
+            data.ActionText = actionText;
+            data.TooltipText = tooltipText;
+            data.NotificationStyle =
+                severity == CheckIncomingChanges.Severity.Info ?
+                NotificationPanelData.StyleType.Green :
+                NotificationPanelData.StyleType.Red;
+        }
+
+        bool mIsVisible;
+
+        NotificationPanelData mPanelData = new NotificationPanelData();
+
+        EditorWindow mWindow;
+    }
+}
diff --git a/Editor/PlasticSCM/Gluon/IncomingChangesNotificationPanel.cs.meta b/Editor/PlasticSCM/Gluon/IncomingChangesNotificationPanel.cs.meta
new file mode 100644
index 0000000..f516271
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/IncomingChangesNotificationPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ce3213c8a4f206e4fbb16f8a19cea39a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon/ProgressOperationHandler.cs b/Editor/PlasticSCM/Gluon/ProgressOperationHandler.cs
new file mode 100644
index 0000000..ae36ef2
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/ProgressOperationHandler.cs
@@ -0,0 +1,72 @@
+using GluonGui.WorkspaceWindow.Views.Checkin.Operations;
+using GluonGui.WorkspaceWindow.Views.WorkspaceExplorer.Explorer;
+
+namespace Unity.PlasticSCM.Editor.Gluon
+{
+    internal class ProgressOperationHandler : IUpdateProgress, ICheckinProgress
+    {
+        internal ProgressOperationHandler(PlasticGUIClient guiClient)
+        {
+            mGuiClient = guiClient;
+        }
+
+        internal bool IsOperationInProgress()
+        {
+            return mUpdateProgress != null
+                || mCheckinProgress != null;
+        }
+
+        internal void CancelUpdateProgress()
+        {
+            mUpdateProgress.Cancel();
+        }
+
+        void ICheckinProgress.ShowProgress()
+        {
+            mCheckinProgress = new CheckinProgress(mGuiClient);
+        }
+
+        void ICheckinProgress.RefreshProgress(CheckinProgressData progress)
+        {
+            mCheckinProgress.Refresh(progress);
+        }
+
+        void ICheckinProgress.EndProgress()
+        {
+            mCheckinProgress = null;
+            mGuiClient.Progress.ResetProgress();
+            mGuiClient.RequestRepaint();
+        }
+
+        void IUpdateProgress.ShowNoCancelableProgress()
+        {
+            mUpdateProgress = new UpdateProgress(mGuiClient);
+            mUpdateProgress.SetCancellable(false);
+        }
+
+        void IUpdateProgress.ShowCancelableProgress()
+        {
+            mUpdateProgress = new UpdateProgress(mGuiClient);
+            mUpdateProgress.SetCancellable(true);
+        }
+
+        void IUpdateProgress.RefreshProgress(
+            Codice.Client.BaseCommands.UpdateProgress updateProgress,
+            UpdateProgressData updateProgressData)
+        {
+            mUpdateProgress.RefreshProgress(updateProgress, updateProgressData);
+        }
+
+        void IUpdateProgress.EndProgress()
+        {
+            mUpdateProgress = null;
+            mGuiClient.Progress.ResetProgress();
+            mGuiClient.RequestRepaint();
+        }
+
+        UpdateProgress mUpdateProgress;
+        CheckinProgress mCheckinProgress;
+
+        PlasticGUIClient mGuiClient;
+    }
+}
diff --git a/Editor/PlasticSCM/Gluon/ProgressOperationHandler.cs.meta b/Editor/PlasticSCM/Gluon/ProgressOperationHandler.cs.meta
new file mode 100644
index 0000000..f8b5f30
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/ProgressOperationHandler.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 09b199e86de5d1944ab9106ca2c11f75
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon/UpdateProgress.cs b/Editor/PlasticSCM/Gluon/UpdateProgress.cs
new file mode 100644
index 0000000..b6f90ae
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateProgress.cs
@@ -0,0 +1,41 @@
+using GluonGui.WorkspaceWindow.Views.WorkspaceExplorer.Explorer;
+
+namespace Unity.PlasticSCM.Editor.Gluon
+{
+    internal class UpdateProgress
+    {
+        internal UpdateProgress(PlasticGUIClient guiClient)
+        {
+            mGuiClient = guiClient;
+        }
+
+        internal void Cancel()
+        {
+            if (mUpdateProgress == null)
+                return;
+
+            mUpdateProgress.Cancel();
+        }
+
+        internal void SetCancellable(bool bCancelable)
+        {
+            mGuiClient.Progress.CanCancelProgress = bCancelable;
+        }
+
+        internal void RefreshProgress(
+            Codice.Client.BaseCommands.UpdateProgress progress,
+            UpdateProgressData updateProgressData)
+        {
+            mUpdateProgress = progress;
+
+            mGuiClient.Progress.ProgressHeader = updateProgressData.Details;
+
+            mGuiClient.Progress.TotalProgressMessage = updateProgressData.Status;
+            mGuiClient.Progress.TotalProgressPercent = updateProgressData.ProgressValue / 100;
+        }
+
+        Codice.Client.BaseCommands.UpdateProgress mUpdateProgress;
+
+        PlasticGUIClient mGuiClient;
+    }
+}
diff --git a/Editor/PlasticSCM/Gluon/UpdateProgress.cs.meta b/Editor/PlasticSCM/Gluon/UpdateProgress.cs.meta
new file mode 100644
index 0000000..c15d4be
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateProgress.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c13239fbea1666a42b26691afcd91e63
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon/UpdateReport.meta b/Editor/PlasticSCM/Gluon/UpdateReport.meta
new file mode 100644
index 0000000..a58f0e2
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateReport.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a3f9d1ab8dcbb414abb3380d0d8032fc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon/UpdateReport/ErrorListViewItem.cs b/Editor/PlasticSCM/Gluon/UpdateReport/ErrorListViewItem.cs
new file mode 100644
index 0000000..0fbb466
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateReport/ErrorListViewItem.cs
@@ -0,0 +1,20 @@
+using UnityEditor.IMGUI.Controls;
+
+using Codice.Client.BaseCommands;
+
+namespace Unity.PlasticSCM.Editor.Gluon.UpdateReport
+{
+    internal class ErrorListViewItem : TreeViewItem
+    {
+        internal ErrorMessage ErrorMessage { get; private set; }
+
+        internal ErrorListViewItem(int id, ErrorMessage errorMessage)
+            : base(id, 0)
+        {
+            ErrorMessage = errorMessage;
+
+            displayName = errorMessage.Path;
+        }
+    }
+}
+
diff --git a/Editor/PlasticSCM/Gluon/UpdateReport/ErrorListViewItem.cs.meta b/Editor/PlasticSCM/Gluon/UpdateReport/ErrorListViewItem.cs.meta
new file mode 100644
index 0000000..f915971
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateReport/ErrorListViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0188683ab76112f4897348feb19a3b77
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportDialog.cs b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportDialog.cs
new file mode 100644
index 0000000..9c37000
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportDialog.cs
@@ -0,0 +1,273 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.CM.Common;
+using GluonGui.WorkspaceWindow.Views.WorkspaceExplorer.Explorer;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Gluon.UpdateReport
+{
+    internal class UpdateReportDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 800, 400);
+            }
+        }
+
+        internal static UpdateReportResult ShowUpdateReport(
+            WorkspaceInfo wkInfo,
+            List<ErrorMessage> errors,
+            EditorWindow parentWindow)
+        {
+            UpdateReportDialog dialog = Create(wkInfo, errors);
+
+            ResponseType dialogResult = dialog.RunModal(parentWindow);
+
+            UpdateReportResult result = dialog.GetUpdateReportResult();
+
+            result.Result = dialogResult == ResponseType.Ok;
+            return result;
+        }
+
+        protected override void SaveSettings()
+        {
+            TreeHeaderSettings.Save(mUpdateReportListView.multiColumnHeader.state,
+                UnityConstants.GLUON_UPDATE_REPORT_TABLE_SETTINGS_NAME);
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(
+                PlasticLocalization.Name.UpdateResultsTitle));
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.UpdateResultsExplanation));
+
+            DoUpdateReportArea(
+                mUpdateReportListView, mErrorDetailsSplitterState);
+
+            GUILayout.Space(10);
+
+            DoSelectAllArea();
+
+            GUILayout.Space(20);
+
+            DoButtonsArea(mIsUpdateForcedButtonEnabled);
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.UpdateResultsTitle);
+        }
+
+        void OnCheckedErrorChanged()
+        {
+            mIsUpdateForcedButtonEnabled =
+                mUpdateReportListView.IsAnyErrorChecked();
+            mIsSelectAllToggleChecked =
+                mUpdateReportListView.AreAllErrorsChecked();
+        }
+
+        UpdateReportResult GetUpdateReportResult()
+        {
+            return new UpdateReportResult
+            {
+                UpdateForcedPaths = mUpdateReportListView.GetCheckedPaths(),
+                UnaffectedErrors = mUpdateReportListView.GetUncheckedErrors()
+            };
+        }
+
+        static void UpdateUpdateReportList(
+            UpdateReportListView updateReportListView,
+            List<ErrorMessage> errorMessages)
+        {
+            updateReportListView.BuildModel(errorMessages);
+
+            updateReportListView.Reload();
+        }
+
+        static string GetErrorDetailsText(
+            ErrorMessage selectedErrorMessage)
+        {
+            if (selectedErrorMessage == null)
+                return string.Empty;
+
+            return string.Format("{0}:{1}{2}",
+                selectedErrorMessage.Path,
+                Environment.NewLine,
+                selectedErrorMessage.Error);
+        }
+
+        void DoUpdateReportArea(
+            UpdateReportListView updateReportListView,
+            object splitterState)
+        {
+            PlasticSplitterGUILayout.BeginHorizontalSplit(splitterState);
+
+            DoUpdateReportViewArea(updateReportListView);
+
+            DoErrorDetailsTextArea(updateReportListView.GetSelectedError());
+
+            PlasticSplitterGUILayout.EndHorizontalSplit();
+        }
+
+        static void DoUpdateReportViewArea(
+            UpdateReportListView updateReportListView)
+        {
+            Rect treeRect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            updateReportListView.OnGUI(treeRect);
+        }
+
+        void DoErrorDetailsTextArea(
+            ErrorMessage selectedErrorMessage)
+        {
+            string errorDetailsText =
+                GetErrorDetailsText(selectedErrorMessage);
+
+            mErrorDetailsScrollPosition = GUILayout.BeginScrollView(
+                mErrorDetailsScrollPosition);
+
+            GUILayout.TextArea(
+                errorDetailsText, UnityStyles.TextFieldWithWrapping,
+                GUILayout.ExpandHeight(true));
+
+            GUILayout.EndScrollView();
+        }
+
+        void DoSelectAllArea()
+        {
+            bool wasChecked = mIsSelectAllToggleChecked;
+
+            bool isChecked = EditorGUILayout.ToggleLeft(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.SelectAll),
+                wasChecked);
+
+            if (!wasChecked && isChecked)
+            {
+                mIsSelectAllToggleChecked = true;
+                mUpdateReportListView.CheckAllLines();
+                return;
+            }
+
+            if (wasChecked && !isChecked)
+            {
+                mIsSelectAllToggleChecked = false;
+                mUpdateReportListView.UncheckAllLines();
+                return;
+            }
+        }
+
+        void DoButtonsArea(bool isUpdateForcedButtonEnabled)
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoUpdateForcedButton(isUpdateForcedButtonEnabled);
+                    DoCloseButton();
+                    return;
+                }
+
+                DoCloseButton();
+                DoUpdateForcedButton(isUpdateForcedButtonEnabled);
+            }
+        }
+
+        void DoUpdateForcedButton(bool isEnabled)
+        {
+            GUI.enabled = isEnabled;
+
+            mEnterKeyAction = GetEnterKeyAction(isEnabled);
+
+            bool pressed = AcceptButton(PlasticLocalization.GetString(
+                PlasticLocalization.Name.UpdateForced));
+
+            GUI.enabled = true;
+
+            if (!pressed)
+                return;
+
+            OkButtonAction();
+        }
+
+        void DoCloseButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CloseButton)))
+                return;
+
+            CloseButtonAction();
+        }
+
+        Action GetEnterKeyAction(bool isEnabled)
+        {
+            if (isEnabled)
+                return OkButtonAction;
+
+            return null;
+        }
+
+        void BuildComponents(WorkspaceInfo wkInfo)
+        {
+            UpdateReportListHeaderState updateReportListHeaderState =
+                UpdateReportListHeaderState.GetDefault();
+            TreeHeaderSettings.Load(updateReportListHeaderState,
+                UnityConstants.GLUON_UPDATE_REPORT_TABLE_SETTINGS_NAME,
+                UnityConstants.UNSORT_COLUMN_ID);
+
+            mUpdateReportListView = new UpdateReportListView(
+                wkInfo, updateReportListHeaderState,
+                OnCheckedErrorChanged);
+            mUpdateReportListView.Reload();
+        }
+
+        static UpdateReportDialog Create(
+            WorkspaceInfo wkInfo, 
+            List<ErrorMessage> errors)
+        {
+            var instance = CreateInstance<UpdateReportDialog>();
+            instance.mWkInfo = wkInfo;
+            instance.mErrors = errors;
+            instance.mEscapeKeyAction = instance.CloseButtonAction;
+
+            instance.BuildComponents(instance.mWkInfo);
+
+            instance.mErrorDetailsSplitterState = PlasticSplitterGUILayout.InitSplitterState(
+                new float[] { 0.50f, 0.50f },
+                new int[] { 100, 100 },
+                new int[] { 100000, 100000 }
+            );
+
+            UpdateUpdateReportList(
+                instance.mUpdateReportListView,
+                instance.mErrors);
+
+            return instance;
+        }
+
+        bool mIsSelectAllToggleChecked;
+        bool mIsUpdateForcedButtonEnabled;
+        object mErrorDetailsSplitterState;
+        Vector2 mErrorDetailsScrollPosition;
+
+        UpdateReportListView mUpdateReportListView;
+
+        List<ErrorMessage> mErrors;
+        WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportDialog.cs.meta b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportDialog.cs.meta
new file mode 100644
index 0000000..d99d79f
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7c0160d91d8eec24bbb43873243d2343
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListHeaderState.cs b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListHeaderState.cs
new file mode 100644
index 0000000..e11e30a
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListHeaderState.cs
@@ -0,0 +1,71 @@
+using System;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Gluon.UpdateReport
+{
+    internal enum UpdateReportListColumn
+    {
+        Path
+    }
+
+    [Serializable]
+    internal class UpdateReportListHeaderState : MultiColumnHeaderState, ISerializationCallbackReceiver
+    {
+        internal static UpdateReportListHeaderState GetDefault()
+        {
+            return new UpdateReportListHeaderState(BuildColumns());
+        }
+
+        internal static string GetColumnName(UpdateReportListColumn column)
+        {
+            switch (column)
+            {
+                case UpdateReportListColumn.Path:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn);
+                default:
+                    return null;
+            }
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            if (mHeaderTitles != null)
+                TreeHeaderColumns.SetTitles(columns, mHeaderTitles);
+        }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+        }
+
+        static Column[] BuildColumns()
+        {
+            return new Column[]
+                {
+                    new Column()
+                    {
+                        width = 600,
+                        headerContent = new GUIContent(
+                            GetColumnName(UpdateReportListColumn.Path)),
+                        minWidth = 200,
+                        allowToggleVisibility = false,
+                        canSort = false
+                    }
+                };
+        }
+
+        UpdateReportListHeaderState(Column[] columns)
+            : base(columns)
+        {
+            if (mHeaderTitles == null)
+                mHeaderTitles = TreeHeaderColumns.GetTitles(columns);
+        }
+
+        [SerializeField]
+        string[] mHeaderTitles;
+    }
+}
diff --git a/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListHeaderState.cs.meta b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListHeaderState.cs.meta
new file mode 100644
index 0000000..7dc5f90
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListHeaderState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f40a58028b39d3f4bbebe1f6cf919271
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListView.cs b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListView.cs
new file mode 100644
index 0000000..0da5462
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListView.cs
@@ -0,0 +1,269 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Common;
+using Codice.CM.Common;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Gluon.UpdateReport
+{
+    internal class UpdateReportListView : TreeView
+    {
+        internal UpdateReportListView(
+            WorkspaceInfo wkInfo,
+            UpdateReportListHeaderState headerState,
+            Action onCheckedErrorChanged)
+            : base(new TreeViewState())
+        {
+            mWkInfo = wkInfo;
+            mOnCheckedErrorChanged = onCheckedErrorChanged;
+
+            multiColumnHeader = new MultiColumnHeader(headerState);
+            multiColumnHeader.canSort = false;
+
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem rootItem)
+        {
+            RegenerateRows(
+                this, mErrorMessages, rootItem, mRows);
+
+            return mRows;
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            if (args.item is ErrorListViewItem)
+            {
+                ErrorListViewItemGUI(
+                    rowHeight, mWkInfo, mCheckedErrors,
+                    (ErrorListViewItem)args.item,
+                    mOnCheckedErrorChanged, args);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        internal void BuildModel(List<ErrorMessage> errorMessages)
+        {
+            mCheckedErrors.Clear();
+
+            mErrorMessages = errorMessages;
+
+            mOnCheckedErrorChanged();
+        }
+
+        internal void CheckAllLines()
+        {
+            mCheckedErrors.Clear();
+
+            foreach (ErrorMessage error in mErrorMessages)
+                mCheckedErrors.Add(error);
+
+            mOnCheckedErrorChanged();
+        }
+
+        internal void UncheckAllLines()
+        {
+            mCheckedErrors.Clear();
+
+            mOnCheckedErrorChanged();
+        }
+
+        internal bool AreAllErrorsChecked()
+        {
+            if (mErrorMessages.Count == 0)
+                return false;
+
+            return mCheckedErrors.Count == mErrorMessages.Count;
+        }
+
+        internal bool IsAnyErrorChecked()
+        {
+            return mCheckedErrors.Count > 0;
+        }
+
+        internal List<string> GetCheckedPaths()
+        {
+            return mCheckedErrors.Select(
+                message => message.Path).ToList();
+        }
+
+        internal List<ErrorMessage> GetUncheckedErrors()
+        {
+            return mErrorMessages.Where(
+                message => !mCheckedErrors.Contains(message)).ToList();
+        }
+
+        internal ErrorMessage GetSelectedError()
+        {
+            List<ErrorMessage> selectedErrors = GetSelectedErrors(this);
+
+            if (selectedErrors.Count != 1)
+                return null;
+
+            return selectedErrors[0];
+        }
+
+        static void UpdateCheckState(
+            HashSet<ErrorMessage> checkedErrors,
+            ErrorMessage errorMessage,
+            bool isChecked)
+        {
+            if (isChecked)
+            {
+                checkedErrors.Add(errorMessage);
+                return;
+            }
+
+            checkedErrors.Remove(errorMessage);
+        }
+
+        static List<ErrorMessage> GetSelectedErrors(
+            UpdateReportListView listView)
+        {
+            List<ErrorMessage> result = new List<ErrorMessage>();
+
+            IList<int> selectedIds = listView.GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (ErrorListViewItem treeViewItem in
+                listView.FindRows(selectedIds))
+            {
+                result.Add(treeViewItem.ErrorMessage);
+            }
+
+            return result;
+        }
+
+        static void RegenerateRows(
+            UpdateReportListView listView,
+            List<ErrorMessage> errorMessages,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            ClearRows(rootItem, rows);
+
+            if (errorMessages.Count == 0)
+                return;
+
+            for (int i = 0; i < errorMessages.Count; i++)
+            {
+                ErrorListViewItem errorListViewItem =
+                    new ErrorListViewItem(i + 1, errorMessages[i]);
+
+                rootItem.AddChild(errorListViewItem);
+                rows.Add(errorListViewItem);
+            }
+
+            listView.SetSelection(new List<int> { 1 });
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static void ErrorListViewItemGUI(
+            float rowHeight,
+            WorkspaceInfo wkInfo,
+            HashSet<ErrorMessage> checkedErrors,
+            ErrorListViewItem item,
+            Action onCheckedErrorChanged,
+            RowGUIArgs args)
+        {
+            for (int visibleColumnIdx = 0; visibleColumnIdx < args.GetNumVisibleColumns(); visibleColumnIdx++)
+            {
+                Rect cellRect = args.GetCellRect(visibleColumnIdx);
+
+                UpdateReportListColumn column =
+                    (UpdateReportListColumn)args.GetColumn(visibleColumnIdx);
+
+                ErrorListViewItemCellGUI(
+                    cellRect, rowHeight, wkInfo, checkedErrors,
+                    item, onCheckedErrorChanged, column,
+                    args.selected, args.focused);
+            }
+        }
+
+        static void ErrorListViewItemCellGUI(
+            Rect rect,
+            float rowHeight,
+            WorkspaceInfo wkInfo,
+            HashSet<ErrorMessage> checkedErrors,
+            ErrorListViewItem item,
+            Action onCheckedErrorChanged,
+            UpdateReportListColumn column,
+            bool isSelected,
+            bool isFocused)
+        {
+            ErrorMessage errorMessage = item.ErrorMessage;
+
+            string label = GetColumnText(
+                wkInfo, errorMessage,
+                UpdateReportListHeaderState.GetColumnName(column));
+
+            bool wasChecked = checkedErrors.Contains(errorMessage);
+
+            bool isChecked = DrawTreeViewItem.ForCheckableItemCell(
+                rect, rowHeight, 0, null, null, label,
+                isSelected, isFocused, false, wasChecked);
+
+            if (wasChecked != isChecked)
+            {
+                UpdateCheckState(
+                    checkedErrors, errorMessage, isChecked);
+
+                onCheckedErrorChanged();
+            }
+        }
+
+        static string GetColumnText(
+            WorkspaceInfo wkInfo, ErrorMessage message, string columnName)
+        {
+            if (columnName != PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PathColumn))
+            {
+                return string.Empty;
+            }
+
+            return WorkspacePath.ClientToCM(
+                message.Path, wkInfo.ClientPath);
+        }
+
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        HashSet<ErrorMessage> mCheckedErrors = new HashSet<ErrorMessage>();
+        List<ErrorMessage> mErrorMessages = new List<ErrorMessage>();
+
+        readonly Action mOnCheckedErrorChanged;
+        readonly WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListView.cs.meta b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListView.cs.meta
new file mode 100644
index 0000000..f2652dc
--- /dev/null
+++ b/Editor/PlasticSCM/Gluon/UpdateReport/UpdateReportListView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c5d431e8131b1d74897c1a18b5e76932
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Help.meta b/Editor/PlasticSCM/Help.meta
new file mode 100644
index 0000000..0e29588
--- /dev/null
+++ b/Editor/PlasticSCM/Help.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7e0953c9537eaac42b01e0e3bf3b6223
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Help/BuildFormattedHelp.cs b/Editor/PlasticSCM/Help/BuildFormattedHelp.cs
new file mode 100644
index 0000000..573e070
--- /dev/null
+++ b/Editor/PlasticSCM/Help/BuildFormattedHelp.cs
@@ -0,0 +1,173 @@
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Help
+{
+    internal class FormattedHelpLink
+    {
+        internal HelpLink Source;
+        internal int Position;
+        internal int Length;
+    }
+
+    internal static class BuildFormattedHelp
+    {
+        internal static void ForData(
+            string plainText,
+            HelpFormat[] formattedBlocks,
+            HelpLink[] links,
+            out string formattedHelpText,
+            out List<FormattedHelpLink> formattedLinks)
+        {
+            formattedHelpText = string.Empty;
+            formattedLinks = new List<FormattedHelpLink>();
+
+            List<object> segments = new List<object>();
+            segments.AddRange(formattedBlocks);
+            segments.AddRange(links);
+            var sortedSegments = segments.OrderBy(
+                n => n is HelpFormat ?
+                ((HelpFormat)n).Position :
+                ((HelpLink)n).Position);
+
+            StringBuilder sb = new StringBuilder();
+
+            int lastIndex = 0;
+            foreach (var segment in sortedSegments)
+            {
+                Segment.Data segmentData = GetSegmentData(segment);
+
+                if (segmentData.Begin > lastIndex)
+                    sb.Append(plainText.Substring(lastIndex, segmentData.Begin - lastIndex));
+
+                string plainSegment = plainText.Substring(
+                    segmentData.Begin, segmentData.Length);
+
+                if (segment is HelpLink)
+                {
+                    formattedLinks.Add(new FormattedHelpLink()
+                    {
+                        Source = (HelpLink)segment,
+                        Position = sb.Length,
+                        Length = segmentData.Prefix.Length +
+                                 plainSegment.Length +
+                                 segmentData.Suffix.Length
+                    });
+                }
+
+                sb.Append(segmentData.Prefix);
+                sb.Append(plainSegment);
+                sb.Append(segmentData.Suffix);
+
+                lastIndex = segmentData.Begin + segmentData.Length;
+            }
+
+            sb.Append(plainText.Substring(lastIndex));
+
+            formattedHelpText = sb.ToString();
+        }
+
+        internal static bool IsLinkMetaChar(
+            FormattedHelpLink formattedLink,
+            int charIndex)
+        {
+            int prefixEndIndex =
+                formattedLink.Position +
+                Segment.LINK_PREFIX.Length - 1;
+
+            if (formattedLink.Position <= charIndex &&
+                charIndex <= prefixEndIndex)
+                return true;
+
+            int suffixStartIndex =
+                formattedLink.Position +
+                formattedLink.Length - Segment.LINK_SUFFIX.Length;
+
+            if (suffixStartIndex <= charIndex &&
+                charIndex <= (formattedLink.Position + formattedLink.Length - 1))
+                return true;
+
+            return false;
+        }
+
+        static Segment.Data GetSegmentData(object segment)
+        {
+            if (segment is HelpLink)
+            {
+                HelpLink link = (HelpLink)segment;
+                return Segment.BuildForLink(link);
+            }
+
+            HelpFormat format = (HelpFormat)segment;
+            return Segment.BuildForFormat(format);
+        }
+
+        static class Segment
+        {
+            internal class Data
+            {
+                internal int Begin;
+                internal int Length;
+                internal string Prefix;
+                internal string Suffix;
+            }
+
+            internal static Data BuildForLink(HelpLink link)
+            {
+                return new Data()
+                {
+                    Begin = link.Position,
+                    Length = link.Length,
+                    Prefix = LINK_PREFIX,
+                    Suffix = LINK_SUFFIX
+                };
+            }
+
+            internal static Data BuildForFormat(HelpFormat format)
+            {
+                switch (format.Type)
+                {
+                    case HelpFormat.FormatType.Title:
+                        return new Data()
+                        {
+                            Begin = format.Position,
+                            Length = format.Length,
+                            Prefix = TITLE_PREFIX,
+                            Suffix = TITLE_SUFFIX
+                        };
+                    case HelpFormat.FormatType.Bold:
+                        return new Data()
+                        {
+                            Begin = format.Position,
+                            Length = format.Length,
+                            Prefix = BOLD_PREFIX,
+                            Suffix = BOLD_SUFFIX
+                        };
+                    case HelpFormat.FormatType.Underline:
+                        // NOTE(rafa): No support yet for underline, we use italic instead
+                        return new Data()
+                        {
+                            Begin = format.Position,
+                            Length = format.Length,
+                            Prefix = ITALIC_PREFIX,
+                            Suffix = ITALIC_SUFFIX
+                        };
+                    default:
+                        return null;
+                }
+            }
+
+            internal const string LINK_PREFIX = "<color=\"" + UnityStyles.HexColors.LINK_COLOR + "\">";
+            internal const string LINK_SUFFIX = "</color>";
+            const string TITLE_PREFIX = "<size=16>";
+            const string TITLE_SUFFIX = "</size>";
+            const string BOLD_PREFIX = "<b>";
+            const string BOLD_SUFFIX = "</b>";
+            const string ITALIC_PREFIX = "<i>";
+            const string ITALIC_SUFFIX = "</i>";
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Help/BuildFormattedHelp.cs.meta b/Editor/PlasticSCM/Help/BuildFormattedHelp.cs.meta
new file mode 100644
index 0000000..94320a2
--- /dev/null
+++ b/Editor/PlasticSCM/Help/BuildFormattedHelp.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ed669a00ecaa3ff45b9d6eb52f4a478f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Help/DrawHelpPanel.cs b/Editor/PlasticSCM/Help/DrawHelpPanel.cs
new file mode 100644
index 0000000..46b4a1c
--- /dev/null
+++ b/Editor/PlasticSCM/Help/DrawHelpPanel.cs
@@ -0,0 +1,192 @@
+using System.Diagnostics;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.Common;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Help
+{
+    internal static class DrawHelpPanel
+    {
+        internal static void For(
+            HelpPanel helpPanel)
+        {
+            if (!helpPanel.Visible)
+                return;
+
+            DoHelpPanelToolbar(helpPanel);
+
+            GUILayout.Space(10);
+
+            DoHelpPanelContent(helpPanel);
+        }
+
+        static void DoHelpPanelToolbar(
+            HelpPanel helpPanel)
+        {
+            Rect rect = GUILayoutUtility.GetLastRect();
+            rect.y = rect.yMax;
+            rect.height = 22;
+
+            GUILayout.Space(1);
+            GUIStyle expandableToolbar = new GUIStyle(EditorStyles.toolbar);
+            expandableToolbar.fixedHeight = 0;
+            GUI.Label(rect, GUIContent.none, expandableToolbar);
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                if (GUILayout.Button("<", EditorStyles.miniButtonLeft))
+                {
+                    // TODO(codice): On Left Clicked
+                }
+
+                if (GUILayout.Button(">", EditorStyles.miniButtonRight))
+                {
+                    // TODO(codice): On Right Clicked
+                }
+
+                GUILayout.FlexibleSpace();
+
+                // TODO(codice): The bool used here must be loaded and persisted by some means
+                helpPanel.Data.ShouldShowAgain = EditorGUILayout.ToggleLeft(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.DontShowItAgain),
+                    helpPanel.Data.ShouldShowAgain, UnityStyles.MiniToggle);
+                bool okWasPressed = GUILayout.Button(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.OkButton),
+                    EditorStyles.miniButton);
+
+                if (okWasPressed)
+                {
+                    helpPanel.Hide();
+                    // TODO(codice): Do on helppanel dismiss actions
+                    return;
+                }
+            }
+        }
+
+        static void DoHelpPanelContent(
+            HelpPanel helpPanel)
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                Texture image = Images.GetHelpImage(helpPanel.Image);
+
+                var imgRect = GUILayoutUtility.GetRect(
+                    image.width, image.width, image.height, image.height);
+
+                GUI.DrawTexture(imgRect, image, ScaleMode.ScaleToFit);
+
+                using (new EditorGUILayout.VerticalScope())
+                {
+                    GUIStyle helpParagraph = UnityStyles.Paragraph;
+
+                    helpPanel.TextScroll = GUILayout.BeginScrollView(helpPanel.TextScroll);
+
+                    GUILayout.Label(helpPanel.GUIContent, helpParagraph);
+
+                    if (Event.current.type != EventType.Layout)
+                        DoHelpPanelLinks(helpPanel, helpParagraph);
+
+                    GUILayout.EndScrollView();
+
+                    Rect scrollRect = GUILayoutUtility.GetLastRect();
+                    if (Mouse.IsRightMouseButtonPressed(Event.current) &&
+                        scrollRect.Contains(Event.current.mousePosition))
+                    {
+                        GenericMenu contextMenu = BuildHelpPanelMenu(helpPanel.Data.CleanText);
+                        contextMenu.ShowAsContext();
+                    }
+                }
+            }
+        }
+
+        static void DoHelpPanelLinks(
+            HelpPanel helpPanel,
+            GUIStyle helpParagraph)
+        {
+            var lastRect = GUILayoutUtility.GetLastRect();
+
+            bool linkWasClicked = false;
+            GUIContent charContent = new GUIContent();
+            for (int charIdx = 0; charIdx < helpPanel.GUIContent.text.Length; charIdx++)
+            {
+                HelpLink link;
+                if (!helpPanel.TryGetLinkAtChar(charIdx, out link))
+                    continue;
+
+                charContent.text = helpPanel.GUIContent.text[charIdx].ToString();
+
+                var pos = helpParagraph.GetCursorPixelPosition(
+                    lastRect, helpPanel.GUIContent, charIdx);
+
+                float charWidth = helpParagraph.CalcSize(charContent).x;
+
+                Rect charRect = new Rect(pos, new Vector2(
+                    charWidth - 4, helpParagraph.lineHeight));
+
+                if (!linkWasClicked &&
+                    Mouse.IsLeftMouseButtonPressed(Event.current) &&
+                    charRect.Contains(Event.current.mousePosition))
+                {
+                    linkWasClicked = true;
+                    OnHelpLinkClicked(helpPanel, link);
+                }
+
+                // Underline for links
+                charRect.y = charRect.yMax - 1;
+                charRect.height = 1;
+                GUI.DrawTexture(charRect, Images.GetLinkUnderlineImage());
+            }
+        }
+
+        static void OnHelpLinkClicked(
+            HelpPanel helpPanel,
+            HelpLink helpLink)
+        {
+            HelpLink.LinkType linkType;
+            string content;
+
+            if (!HelpLinkData.TryGet(helpLink.Link, out linkType, out content))
+                return;
+
+            switch (linkType)
+            {
+                case HelpLink.LinkType.Action:
+                    GuiMessage.ShowInformation(
+                        "An ACTION link has been clicked:\n" + content);
+                    break;
+                case HelpLink.LinkType.Help:
+                    helpPanel.Show(
+                        PlasticGui.Help.HelpImage.GenericBuho,
+                        content == "sample1" ?
+                            TestingHelpData.GetSample1() :
+                            TestingHelpData.GetSample2());
+                    break;
+                case HelpLink.LinkType.Link:
+                    Process.Start(content);
+                    break;
+            }
+        }
+
+        static void CopyToClipboard(string data)
+        {
+            EditorGUIUtility.systemCopyBuffer = data;
+        }
+
+        static GenericMenu BuildHelpPanelMenu(string cleanText)
+        {
+            GenericMenu result = new GenericMenu();
+
+            result.AddItem(
+                new GUIContent(PlasticLocalization.GetString(PlasticLocalization.Name.Copy)),
+                false,
+                () => CopyToClipboard(cleanText)
+            );
+
+            return result;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Help/DrawHelpPanel.cs.meta b/Editor/PlasticSCM/Help/DrawHelpPanel.cs.meta
new file mode 100644
index 0000000..c631590
--- /dev/null
+++ b/Editor/PlasticSCM/Help/DrawHelpPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: db1d9800cb39bae4299b611ea7d86b2d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Help/HelpData.cs b/Editor/PlasticSCM/Help/HelpData.cs
new file mode 100644
index 0000000..7b4e51d
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpData.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Unity.PlasticSCM.Editor.Help
+{
+    internal class HelpData
+    {
+        internal List<HelpFormat> FormattedBlocks = new List<HelpFormat>();
+        internal List<HelpLink> Links = new List<HelpLink>();
+        internal string CleanText;
+        internal bool ShouldShowAgain;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Help/HelpData.cs.meta b/Editor/PlasticSCM/Help/HelpData.cs.meta
new file mode 100644
index 0000000..2c13063
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 888ac39227622bd40b0b9956dc68b73d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Help/HelpFormat.cs b/Editor/PlasticSCM/Help/HelpFormat.cs
new file mode 100644
index 0000000..bd314c1
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpFormat.cs
@@ -0,0 +1,16 @@
+namespace Unity.PlasticSCM.Editor.Help
+{
+    internal class HelpFormat
+    {
+        internal enum FormatType
+        {
+            Title,
+            Bold,
+            Underline
+        }
+
+        internal int Position;
+        internal int Length;
+        internal FormatType Type;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Help/HelpFormat.cs.meta b/Editor/PlasticSCM/Help/HelpFormat.cs.meta
new file mode 100644
index 0000000..d20659d
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpFormat.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f7eede78e1db095499f674a48eac686b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Help/HelpLink.cs b/Editor/PlasticSCM/Help/HelpLink.cs
new file mode 100644
index 0000000..327b109
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpLink.cs
@@ -0,0 +1,18 @@
+namespace Unity.PlasticSCM.Editor.Help
+{
+    internal class HelpLink
+    {
+        internal enum LinkType
+        {
+            Action,
+            Help,
+            Link,
+        }
+
+        internal int Position;
+        internal int Length;
+        internal string Link;
+
+        internal LinkType Type = LinkType.Action;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Help/HelpLink.cs.meta b/Editor/PlasticSCM/Help/HelpLink.cs.meta
new file mode 100644
index 0000000..af8f368
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpLink.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7613946404a945a43bd9b5142a436f21
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Help/HelpLinkData.cs b/Editor/PlasticSCM/Help/HelpLinkData.cs
new file mode 100644
index 0000000..ecd3f35
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpLinkData.cs
@@ -0,0 +1,42 @@
+using System;
+
+using Codice.LogWrapper;
+
+namespace Unity.PlasticSCM.Editor.Help
+{
+    internal static class HelpLinkData
+    {
+        internal static bool TryGet(
+            string link, out HelpLink.LinkType type, out string content)
+        {
+            type = HelpLink.LinkType.Link;
+            content = string.Empty;
+
+            int separatorIdx = link.IndexOf(':');
+            if (separatorIdx == -1)
+                return false;
+
+            string key = link.Substring(0, separatorIdx);
+
+            try
+            {
+                type = (HelpLink.LinkType)Enum.Parse(
+                    typeof(HelpLink.LinkType), key, true);
+            }
+            catch (Exception ex)
+            {
+                mLog.ErrorFormat("Unable to get help link data: '{0}': {1}",
+                    key, ex.Message);
+                mLog.DebugFormat("StackTrace: {0}", ex.StackTrace);
+
+                return false;
+            }
+
+            content = link.Substring(separatorIdx + 1);
+
+            return true;
+        }
+
+        static readonly ILog mLog = LogManager.GetLogger("HelpLinkData");
+    }
+}
diff --git a/Editor/PlasticSCM/Help/HelpLinkData.cs.meta b/Editor/PlasticSCM/Help/HelpLinkData.cs.meta
new file mode 100644
index 0000000..b3ced29
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpLinkData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d1d2cd7920afc0741b8baae80a676934
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Help/HelpPanel.cs b/Editor/PlasticSCM/Help/HelpPanel.cs
new file mode 100644
index 0000000..6097493
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpPanel.cs
@@ -0,0 +1,123 @@
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEngine;
+
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Help
+{
+    internal class HelpPanel
+    {
+        internal Vector2 TextScroll;
+
+        internal bool Visible { get; private set; }
+
+        internal PlasticGui.Help.HelpImage Image
+        {
+            get { return mHelpImage; }
+        }
+
+        internal HelpData Data
+        {
+            get { return mHelpData; }
+        }
+
+        internal GUIContent GUIContent
+        {
+            get { return mHelpGUIContent; }
+        }
+
+        internal HelpPanel(EditorWindow window)
+        {
+            mWindow = window;
+        }
+
+        internal void Show(PlasticGui.Help.HelpImage helpImage, HelpData helpData)
+        {
+            ClearData();
+
+            UpdateData(helpImage, helpData);
+
+            Visible = true;
+
+            mWindow.Repaint();
+        }
+
+        internal void Hide()
+        {
+            ClearData();
+
+            Visible = false;
+
+            mWindow.Repaint();
+        }
+
+        internal bool TryGetLinkAtChar(
+            int charIndex,
+            out HelpLink link)
+        {
+            link = null;
+
+            FormattedHelpLink formattedLink = GetFormattedLinkAtChar(
+                mFormattedLinks, charIndex);
+
+            if (formattedLink == null)
+                return false;
+
+            link = formattedLink.Source;
+
+            return !BuildFormattedHelp.IsLinkMetaChar(formattedLink, charIndex);
+        }
+
+        void ClearData()
+        {
+            mHelpImage = PlasticGui.Help.HelpImage.GenericBuho;
+            mHelpData = null;
+            mHelpGUIContent = null;
+            mFormattedLinks = null;
+        }
+
+        void UpdateData(PlasticGui.Help.HelpImage helpImage, HelpData helpData)
+        {
+            mHelpImage = helpImage;
+            mHelpData = helpData;
+
+            string formattedHelpText;
+            BuildFormattedHelp.ForData(
+                mHelpData.CleanText,
+                mHelpData.FormattedBlocks.ToArray(),
+                mHelpData.Links.ToArray(),
+                out formattedHelpText,
+                out mFormattedLinks);
+
+            mHelpGUIContent = new GUIContent(formattedHelpText);
+        }
+
+        static FormattedHelpLink GetFormattedLinkAtChar(
+            List<FormattedHelpLink> formattedLinks, int charIndex)
+        {
+            for(int i = 0; i < formattedLinks.Count; i++)
+            {
+                FormattedHelpLink link = formattedLinks[i];
+
+                if (link.Position <= charIndex &&
+                    charIndex < link.Position + link.Length)
+                    return link;
+
+                if (charIndex <= link.Position + link.Length)
+                    return null;
+            }
+
+            return null;
+        }
+
+        PlasticGui.Help.HelpImage mHelpImage;
+        HelpData mHelpData;
+
+        GUIContent mHelpGUIContent;
+        List<FormattedHelpLink> mFormattedLinks;
+
+        EditorWindow mWindow;
+    }
+}
diff --git a/Editor/PlasticSCM/Help/HelpPanel.cs.meta b/Editor/PlasticSCM/Help/HelpPanel.cs.meta
new file mode 100644
index 0000000..fc42440
--- /dev/null
+++ b/Editor/PlasticSCM/Help/HelpPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8bbed09c8363d9a4eb93c8bd2afb96eb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Help/TestingHelpData.cs b/Editor/PlasticSCM/Help/TestingHelpData.cs
new file mode 100644
index 0000000..5759003
--- /dev/null
+++ b/Editor/PlasticSCM/Help/TestingHelpData.cs
@@ -0,0 +1,205 @@
+using System.Collections.Generic;
+
+namespace Unity.PlasticSCM.Editor.Help
+{
+    internal static class TestingHelpData
+    {
+        internal static HelpData GetSample1()
+        {
+            HelpData result = new HelpData();
+
+            result.CleanText = "There are some .private files" + System.Environment.NewLine + System.Environment.NewLine +
+
+"Do not panic, these are copies Plastic creates to preserve files it can't overwrite." + System.Environment.NewLine + System.Environment.NewLine +
+
+"Suppose you have a private file \"src / foo.c\", then switch your workspace to a branch where someone added \"src / foo.c\". Plastic downloads the new file because it is under source control and yours is not. But, it can't delete yours, so it renames it as .private.0." + System.Environment.NewLine + System.Environment.NewLine +
+
+"Makes sense?" + System.Environment.NewLine + System.Environment.NewLine +
+
+"Learn more:" + System.Environment.NewLine +
+"* You have some files ready to be added to version control" + System.Environment.NewLine +
+"* Are you missing any changes?" + System.Environment.NewLine +
+"* Tips to work with Visual Studio projects." + System.Environment.NewLine + System.Environment.NewLine +
+"This is just text after links (like this help link -> content2) to verify that the format is preserved." + System.Environment.NewLine + System.Environment.NewLine +
+"And then that another link at the end works, with some bold text at the end, final!!";
+
+            // IMPORTANT! We need single EOL chars to calculate the positions,
+            // otherwise positions are wrong calculated
+            result.CleanText = result.CleanText.Replace("\r\n", "\n");
+
+            result.FormattedBlocks = new List<HelpFormat>();
+            result.FormattedBlocks.Add(new HelpFormat()
+            {
+                Type = HelpFormat.FormatType.Title,
+                Position = 0,
+                Length = 29
+            });
+
+            result.FormattedBlocks.Add(new HelpFormat()
+            {
+                Type = HelpFormat.FormatType.Bold,
+                Position = result.CleanText.IndexOf("not panic"),
+                Length = "not panic".Length
+            });
+
+            result.FormattedBlocks.Add(new HelpFormat()
+            {
+                Type = HelpFormat.FormatType.Underline,
+                Position = result.CleanText.IndexOf("overwrite"),
+                Length = "overwrite".Length
+            });
+
+            result.FormattedBlocks.Add(new HelpFormat()
+            {
+                Type = HelpFormat.FormatType.Bold,
+                Position = result.CleanText.IndexOf("Makes sense?"),
+                Length = "Makes sense?".Length
+            });
+
+            result.Links = new List<HelpLink>();
+            result.Links.Add(new HelpLink()
+            {
+                Position = result.CleanText.IndexOf("You have some files ready to be added to version control"),
+                Length = "You have some files ready to be added to version control".Length,
+                Link = HelpLinkData.AsString(HelpLink.LinkType.Action, "plasticscm-pendingchanges-filestoadd")
+            });
+            result.Links.Add(new HelpLink()
+            {
+                Position = result.CleanText.IndexOf("Are you missing any changes?"),
+                Length = "Are you missing any changes?".Length,
+                Link = HelpLinkData.AsString(HelpLink.LinkType.Action, "plasticscm-pendingchanges-missingchanges")
+            });
+            result.Links.Add(new HelpLink()
+            {
+                Position = result.CleanText.IndexOf("Tips to work with Visual Studio projects."),
+                Length = "Tips to work with Visual Studio projects.".Length,
+                Link = HelpLinkData.AsString(HelpLink.LinkType.Action, "plasticscm-pendingchanges-visualstudio")
+            });
+
+            result.FormattedBlocks.Add(new HelpFormat()
+            {
+                Type = HelpFormat.FormatType.Bold,
+                Position = result.CleanText.IndexOf("verify that the format is preserved"),
+                Length = "verify that the format is preserved".Length
+            });
+
+            result.Links.Add(new HelpLink()
+            {
+                Position = result.CleanText.IndexOf("this help link"),
+                Length = "this help link".Length,
+                Link = HelpLinkData.AsString(HelpLink.LinkType.Help, "sample2")
+            });
+
+            result.Links.Add(new HelpLink()
+            {
+                Position = result.CleanText.IndexOf("another link at the end"),
+                Length = "another link at the end".Length,
+                Link = HelpLinkData.AsString(HelpLink.LinkType.Link, "https://www.google.com")
+            });
+
+            result.FormattedBlocks.Add(new HelpFormat()
+            {
+                Type = HelpFormat.FormatType.Bold,
+                Position = result.CleanText.IndexOf("bold text at the end"),
+                Length = "bold text at the end".Length
+            });
+
+            return result;
+        }
+
+        internal static HelpData GetSample2()
+        {
+            HelpData result = new HelpData();
+
+            result.CleanText = "Alternative title to confirm that all is working" + System.Environment.NewLine + System.Environment.NewLine +
+
+"This is just another help example to ensure that the panel replaces the helps dynamically." + System.Environment.NewLine + System.Environment.NewLine +
+
+"If you're reading this text, means that the help changed its content dynamically, so we can navigate between help tips by clicking hyperlinks" + System.Environment.NewLine + System.Environment.NewLine +
+
+"Makes sense?" + System.Environment.NewLine + System.Environment.NewLine +
+
+"Learn more:" + System.Environment.NewLine +
+"* You have some files ready to be added to version control" + System.Environment.NewLine +
+"* Are you missing any changes?" + System.Environment.NewLine +
+"* Tips to work with Visual Studio projects." + System.Environment.NewLine + System.Environment.NewLine +
+"This is just text after links (like this help link -> content1) to verify that the format is preserved.";
+
+            // IMPORTANT! We need single EOL chars to calculate the positions,
+            // otherwise positions are wrong calculated
+            result.CleanText = result.CleanText.Replace("\r\n", "\n");
+
+            result.FormattedBlocks = new List<HelpFormat>();
+            result.FormattedBlocks.Add(new HelpFormat()
+            {
+                Type = HelpFormat.FormatType.Title,
+                Position = 0,
+                Length = "Alternative title to confirm that all is working".Length
+            });
+
+            result.FormattedBlocks.Add(new HelpFormat()
+            {
+                Type = HelpFormat.FormatType.Bold,
+                Position = result.CleanText.IndexOf("replaces the helps dynamically"),
+                Length = "replaces the helps dynamically".Length
+            });
+
+            result.Links = new List<HelpLink>();
+            result.Links.Add(new HelpLink()
+            {
+                Position = result.CleanText.IndexOf("You have some files ready to be added to version control"),
+                Length = "You have some files ready to be added to version control".Length,
+                Link = HelpLinkData.AsString(HelpLink.LinkType.Action, "plasticscm-pendingchanges-filestoadd")
+            });
+            result.Links.Add(new HelpLink()
+            {
+                Position = result.CleanText.IndexOf("Are you missing any changes?"),
+                Length = "Are you missing any changes?".Length,
+                Link = HelpLinkData.AsString(HelpLink.LinkType.Action, "plasticscm-pendingchanges-missingchanges")
+            });
+            result.Links.Add(new HelpLink()
+            {
+                Position = result.CleanText.IndexOf("Tips to work with Visual Studio projects."),
+                Length = "Tips to work with Visual Studio projects.".Length,
+                Link = HelpLinkData.AsString(HelpLink.LinkType.Action, "plasticscm-pendingchanges-visualstudio")
+            });
+
+            result.Links.Add(new HelpLink()
+            {
+                Position = result.CleanText.IndexOf("this help link"),
+                Length = "this help link".Length,
+                Link = HelpLinkData.AsString(HelpLink.LinkType.Help, "sample1")
+            });
+
+            return result;
+        }
+
+        class HelpLinkData
+        {
+            internal static string AsString(HelpLink.LinkType linkType, string linkContent)
+            {
+                string linkTypeString = string.Empty;
+
+                switch (linkType)
+                {
+                    case HelpLink.LinkType.Action:
+                        linkTypeString = ACTION;
+                        break;
+                    case HelpLink.LinkType.Help:
+                        linkTypeString = HELP;
+                        break;
+                    case HelpLink.LinkType.Link:
+                        linkTypeString = LINK;
+                        break;
+                }
+
+                return string.Concat(linkTypeString, SEPARATOR, linkContent);
+            }
+
+            const string ACTION = "action";
+            const string HELP = "help";
+            const string LINK = "link";
+            const string SEPARATOR = ":";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Help/TestingHelpData.cs.meta b/Editor/PlasticSCM/Help/TestingHelpData.cs.meta
new file mode 100644
index 0000000..df9f118
--- /dev/null
+++ b/Editor/PlasticSCM/Help/TestingHelpData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fae031d3fccb34244b789b0048117ee7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Inspector.meta b/Editor/PlasticSCM/Inspector.meta
new file mode 100644
index 0000000..83e99a4
--- /dev/null
+++ b/Editor/PlasticSCM/Inspector.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d4f346ffc6a5b7146bdff6f43464df28
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Inspector/DrawInspectorOperations.cs b/Editor/PlasticSCM/Inspector/DrawInspectorOperations.cs
new file mode 100644
index 0000000..8308e5e
--- /dev/null
+++ b/Editor/PlasticSCM/Inspector/DrawInspectorOperations.cs
@@ -0,0 +1,205 @@
+using PlasticGui;
+using System;
+using System.IO;
+using Unity.PlasticSCM.Editor.AssetMenu;
+using Unity.PlasticSCM.Editor.AssetsOverlays;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.UI;
+using UnityEditor;
+using UnityEditor.VersionControl;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.Inspector
+{
+    static class DrawInspectorOperations
+    {
+        internal static void Enable(
+            IAssetMenuOperations operations,
+            IAssetStatusCache statusCache,
+            AssetOperations.IAssetSelection assetsSelection)
+        {
+            mOperations = operations;
+            mStatusCache = statusCache;
+            mAssetsSelection = assetsSelection;
+
+            mIsEnabled = true;
+
+            UnityEditor.Editor.finishedDefaultHeaderGUI +=
+                Editor_finishedDefaultHeaderGUI;
+
+            RefreshAsset.RepaintInspectors();
+        }
+
+        internal static void Disable()
+        {
+            mIsEnabled = false;
+
+            UnityEditor.Editor.finishedDefaultHeaderGUI -=
+                Editor_finishedDefaultHeaderGUI;
+
+            RefreshAsset.RepaintInspectors();
+        }
+
+        static void Editor_finishedDefaultHeaderGUI(UnityEditor.Editor obj)
+        {
+            if (!mIsEnabled)
+                return;
+
+            AssetList assetList = mAssetsSelection.GetSelectedAssets();
+
+            if (mOperations == null ||
+                assetList.Count == 0 ||
+                string.IsNullOrEmpty(assetList[0].path))
+                return;
+
+            string selectionFullPath = Path.GetFullPath(assetList[0].path);
+
+            AssetsOverlays.AssetStatus assetStatus = (assetList.Count > 1) ?
+                AssetsOverlays.AssetStatus.None :
+                mStatusCache.GetStatusForPath(selectionFullPath);
+
+            LockStatusData lockStatusData = mStatusCache.GetLockStatusDataForPath(
+                selectionFullPath);
+
+            SelectedAssetGroupInfo selectedGroupInfo = SelectedAssetGroupInfo.
+                BuildFromAssetList(assetList, mStatusCache);
+
+            AssetMenuOperations assetOperations =
+                AssetMenuUpdater.GetAvailableMenuOperations(selectedGroupInfo);
+
+            bool guiEnabledBck = GUI.enabled;
+            GUI.enabled = true;
+            try
+            {
+                DrawBackRectangle(guiEnabledBck);
+
+                GUILayout.BeginHorizontal();
+                DrawStatusLabels(assetStatus, lockStatusData);
+                GUILayout.FlexibleSpace();
+                DrawButtons(assetList, assetOperations);
+                GUILayout.EndHorizontal();
+            }
+            finally
+            {
+                GUI.enabled = guiEnabledBck;
+            }
+        }
+
+        static void DrawBackRectangle(bool isEnabled)
+        {
+            // when the inspector is disabled, there is a separator line
+            // that breaks the visual style. Draw an empty rectangle
+            // matching the background color to cover it
+
+            GUILayout.Space(
+                UnityConstants.INSPECTOR_ACTIONS_BACK_RECTANGLE_TOP_MARGIN);
+
+            GUIStyle targetStyle = (isEnabled) ?
+                UnityStyles.Inspector.HeaderBackgroundStyle :
+                UnityStyles.Inspector.DisabledHeaderBackgroundStyle;
+
+            Rect rect = GUILayoutUtility.GetRect(
+                GUIContent.none, targetStyle);
+
+            // extra space to cover the inspector full width
+            rect.x -= 20;
+            rect.width += 80;
+
+            GUI.Box(rect, GUIContent.none, targetStyle);
+
+            // now reset the space used by the rectangle
+            GUILayout.Space(
+                -UnityConstants.INSPECTOR_ACTIONS_HEADER_BACK_RECTANGLE_HEIGHT
+                - UnityConstants.INSPECTOR_ACTIONS_BACK_RECTANGLE_TOP_MARGIN);
+        }
+
+        static void DrawButtons(
+            AssetList assetList,
+            AssetMenuOperations selectedGroupInfo)
+        {
+            if (selectedGroupInfo.HasFlag(AssetMenuOperations.Add))
+                DoAddButton();
+
+            if (selectedGroupInfo.HasFlag(AssetMenuOperations.Checkout))
+                DoCheckoutButton();
+
+            if (selectedGroupInfo.HasFlag(AssetMenuOperations.Checkin))
+                DoCheckinButton();
+
+            if (selectedGroupInfo.HasFlag(AssetMenuOperations.Undo))
+                DoUndoButton();
+        }
+
+        static void DrawStatusLabels(
+            AssetsOverlays.AssetStatus assetStatus,
+            LockStatusData lockStatusData)
+        {
+            AssetsOverlays.AssetStatus statusesToDraw = DrawAssetOverlay.GetStatusesToDraw(assetStatus);
+
+            foreach (AssetsOverlays.AssetStatus status in Enum.GetValues(typeof(AssetsOverlays.AssetStatus)))
+            {
+                if (status == AssetsOverlays.AssetStatus.None)
+                    continue;
+
+                if (!statusesToDraw.HasFlag(status))
+                    continue;
+
+                string label = string.Format("{0}",
+                    DrawAssetOverlay.GetStatusString(status));
+
+                Texture icon = DrawAssetOverlay.DrawOverlayIcon.GetOverlayIcon(
+                    status);
+
+                string tooltipText = DrawAssetOverlay.GetTooltipText(
+                    status, lockStatusData);
+
+                GUILayout.Label(new GUIContent(
+                    label, icon, tooltipText), GUILayout.Height(18));
+            }
+        }
+
+        static void DoAddButton()
+        {
+            string buttonText = PlasticLocalization.GetString(PlasticLocalization.Name.AddButton);
+            if (GUILayout.Button(string.Format("{0}", buttonText), EditorStyles.miniButton))
+            {
+                mOperations.Add();
+            }
+        }
+
+        static void DoCheckoutButton()
+        {
+            string buttonText = PlasticLocalization.GetString(PlasticLocalization.Name.CheckoutButton);
+            if (GUILayout.Button(string.Format("{0}", buttonText), EditorStyles.miniButton))
+            {
+                mOperations.Checkout();
+            }
+        }
+
+        static void DoCheckinButton()
+        {
+            string buttonText = PlasticLocalization.GetString(PlasticLocalization.Name.CheckinButton);
+            if (GUILayout.Button(string.Format("{0}", buttonText), EditorStyles.miniButton))
+            {
+                mOperations.Checkin();
+                EditorGUIUtility.ExitGUI();
+            }
+        }
+
+        static void DoUndoButton()
+        {
+            string buttonText = PlasticLocalization.GetString(PlasticLocalization.Name.UndoButton);
+            if (GUILayout.Button(string.Format("{0}", buttonText), EditorStyles.miniButton))
+            {
+                mOperations.Undo();
+                EditorGUIUtility.ExitGUI();
+            }
+        }
+
+        static IAssetMenuOperations mOperations;
+        static IAssetStatusCache mStatusCache;
+        static AssetOperations.IAssetSelection mAssetsSelection;
+        static bool mIsEnabled;
+    }
+}
diff --git a/Editor/PlasticSCM/Inspector/DrawInspectorOperations.cs.meta b/Editor/PlasticSCM/Inspector/DrawInspectorOperations.cs.meta
new file mode 100644
index 0000000..1893670
--- /dev/null
+++ b/Editor/PlasticSCM/Inspector/DrawInspectorOperations.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 28ce2dedf734c7c4e8ad114c00173d65
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Inspector/InspectorAssetSelection.cs b/Editor/PlasticSCM/Inspector/InspectorAssetSelection.cs
new file mode 100644
index 0000000..b18d86c
--- /dev/null
+++ b/Editor/PlasticSCM/Inspector/InspectorAssetSelection.cs
@@ -0,0 +1,21 @@
+using Unity.PlasticSCM.Editor.AssetMenu;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using UnityEditor.VersionControl;
+
+namespace Unity.PlasticSCM.Editor.Inspector
+{
+    internal class InspectorAssetSelection : AssetOperations.IAssetSelection
+    {
+        AssetList AssetOperations.IAssetSelection.GetSelectedAssets()
+        {
+            AssetList result = new AssetList();
+
+            foreach (UnityEngine.Object obj in UnityEditor.Selection.objects)
+            {
+                result.Add(new Asset(AssetsPath.GetFullPath(obj)));
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Inspector/InspectorAssetSelection.cs.meta b/Editor/PlasticSCM/Inspector/InspectorAssetSelection.cs.meta
new file mode 100644
index 0000000..64e9257
--- /dev/null
+++ b/Editor/PlasticSCM/Inspector/InspectorAssetSelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9bef80072d106be4ea36de88adc0e985
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/MetaPath.cs b/Editor/PlasticSCM/MetaPath.cs
new file mode 100644
index 0000000..567affa
--- /dev/null
+++ b/Editor/PlasticSCM/MetaPath.cs
@@ -0,0 +1,28 @@
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class MetaPath
+    {
+        internal const string META_EXTENSION = ".meta";
+
+        internal static bool IsMetaPath(string path)
+        {
+            return path.EndsWith(META_EXTENSION);
+        }
+
+        internal static string GetMetaPath(string path)
+        {
+            return string.Concat(
+                path,
+                META_EXTENSION);
+        }
+
+        internal static string GetPathFromMetaPath(string path)
+        {
+            return path.Substring(
+                0,
+                path.Length - META_EXTENSION.Length);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/MetaPath.cs.meta b/Editor/PlasticSCM/MetaPath.cs.meta
new file mode 100644
index 0000000..873b70a
--- /dev/null
+++ b/Editor/PlasticSCM/MetaPath.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8c0d4be4ea44a684d957cde781ecb6cc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/NewIncomingChanges.cs b/Editor/PlasticSCM/NewIncomingChanges.cs
new file mode 100644
index 0000000..c24e11a
--- /dev/null
+++ b/Editor/PlasticSCM/NewIncomingChanges.cs
@@ -0,0 +1,92 @@
+using System;
+
+using Codice.Client.Common;
+using Codice.CM.Common;
+using PlasticGui.WorkspaceWindow;
+using Unity.PlasticSCM.Editor.UI;
+
+using GluonNewIncomingChangesUpdater = PlasticGui.Gluon.WorkspaceWindow.NewIncomingChangesUpdater;
+using GluonCheckIncomingChanges = PlasticGui.Gluon.WorkspaceWindow.CheckIncomingChanges;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class NewIncomingChanges
+    {
+        internal static NewIncomingChangesUpdater BuildUpdaterForDeveloper(
+            WorkspaceInfo wkInfo,
+            CheckIncomingChanges.IAutoRefreshIncomingChangesView autoRefreshIncomingChangesView,
+            CheckIncomingChanges.IUpdateIncomingChanges updateIncomingChanges)
+        {
+            if (!ClientConfig.Get().GetClientConfigData().IsIncomingChangesEnabled())
+                return null;
+
+            NewIncomingChangesUpdater updater = new NewIncomingChangesUpdater(
+                new UnityPlasticTimerBuilder(), updateIncomingChanges);
+            updater.SetAutoRefreshIncomingChangesView(
+                autoRefreshIncomingChangesView);
+
+            updater.SetWorkspace(wkInfo);
+            updater.Start();
+            return updater;
+        }
+
+        internal static GluonNewIncomingChangesUpdater BuildUpdaterForGluon(
+            WorkspaceInfo wkInfo,
+            GluonCheckIncomingChanges.IAutoRefreshIncomingChangesView autoRefreshIncomingChangesView,
+            GluonCheckIncomingChanges.IUpdateIncomingChanges updateIncomingChanges,
+            GluonCheckIncomingChanges.ICalculateIncomingChanges calculateIncomingChanges)
+        {
+            if (!ClientConfig.Get().GetClientConfigData().IsGluonIncomingChangesEnabled())
+                return null;
+
+            GluonNewIncomingChangesUpdater updater = new GluonNewIncomingChangesUpdater(
+                wkInfo,
+                new UnityPlasticTimerBuilder(),
+                updateIncomingChanges,
+                autoRefreshIncomingChangesView,
+                calculateIncomingChanges);
+
+            updater.Start();
+            return updater;
+        }
+
+        internal static void LaunchUpdater(
+            NewIncomingChangesUpdater developerNewIncomingChangesUpdater,
+            GluonNewIncomingChangesUpdater gluonNewIncomingChangesUpdater)
+        {
+            if (developerNewIncomingChangesUpdater != null)
+            {
+                developerNewIncomingChangesUpdater.Start();
+                developerNewIncomingChangesUpdater.Update();
+            }
+
+            if (gluonNewIncomingChangesUpdater != null)
+            {
+                gluonNewIncomingChangesUpdater.Start();
+                gluonNewIncomingChangesUpdater.Update(DateTime.Now);
+            }
+        }
+
+        internal static void StopUpdater(
+            NewIncomingChangesUpdater developerNewIncomingChangesUpdater,
+            GluonNewIncomingChangesUpdater gluonNewIncomingChangesUpdater)
+        {
+            if (developerNewIncomingChangesUpdater != null)
+                developerNewIncomingChangesUpdater.Stop();
+
+            if (gluonNewIncomingChangesUpdater != null)
+                gluonNewIncomingChangesUpdater.Stop();
+        }
+
+        internal static void DisposeUpdater(
+            NewIncomingChangesUpdater developerNewIncomingChangesUpdater,
+            GluonNewIncomingChangesUpdater gluonNewIncomingChangesUpdater)
+        {
+            if (developerNewIncomingChangesUpdater != null)
+                developerNewIncomingChangesUpdater.Dispose();
+
+            if (gluonNewIncomingChangesUpdater != null)
+                gluonNewIncomingChangesUpdater.Dispose();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/NewIncomingChanges.cs.meta b/Editor/PlasticSCM/NewIncomingChanges.cs.meta
new file mode 100644
index 0000000..2534a47
--- /dev/null
+++ b/Editor/PlasticSCM/NewIncomingChanges.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cd17bd02643083b43bac72747b7641ff
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/PlasticApp.cs b/Editor/PlasticSCM/PlasticApp.cs
new file mode 100644
index 0000000..1069816
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticApp.cs
@@ -0,0 +1,170 @@
+using System;
+using System.IO;
+using System.Linq;
+
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Common;
+using Codice.Client.Common.FsNodeReaders;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using Codice.CM.ConfigureHelper;
+using Codice.LogWrapper;
+using Codice.Utils;
+using PlasticGui;
+using PlasticPipe.Certificates;
+using Unity.PlasticSCM.Editor.Configuration;
+using Unity.PlasticSCM.Editor.UI;
+using MacUI;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class PlasticApp
+    {
+        internal static void InitializeIfNeeded()
+        {
+            if (mIsInitialized)
+                return;
+
+            ConfigureLogging();
+
+            RegisterExceptionHandlers();
+
+            InitLocalization();
+
+            ThreadWaiter.Initialize(new UnityThreadWaiterBuilder());
+            ServicePointConfigurator.ConfigureServicePoint();
+            CertificateUi.RegisterHandler(new ChannelCertificateUiImpl());
+
+            SetupFsWatcher();
+
+            EditionManager.Get().DisableCapability(
+                EnumEditionCapabilities.Extensions);
+
+            ClientHandlers.Register();
+
+            PlasticGuiConfig.SetConfigFile(
+                PlasticGuiConfig.UNITY_GUI_CONFIG_FILE);
+
+            mIsInitialized = true;
+        }
+
+        internal static void Dispose()
+        {
+            UnRegisterExceptionHandlers();
+        }
+
+        static void InitLocalization()
+        {
+            string language = null;
+            try
+            {
+                language = ClientConfig.Get().GetLanguage();
+            }
+            catch
+            {
+                language = string.Empty;
+            }
+
+            Localization.Init(language);
+            PlasticLocalization.SetLanguage(language);
+        }
+
+        static void ConfigureLogging()
+        {
+            try
+            {
+                string log4netpath = ToolConfig.GetUnityPlasticLogConfigFile();
+
+                if (!File.Exists(log4netpath))
+                    WriteLogConfiguration.For(log4netpath);
+
+                XmlConfigurator.Configure(new FileInfo(log4netpath));
+            }
+            catch
+            {
+                //it failed configuring the logging info; nothing to do.
+            }
+        }
+
+        static void RegisterExceptionHandlers()
+        {
+            AppDomain.CurrentDomain.UnhandledException += HandleUnhandledException;
+
+            Application.logMessageReceivedThreaded += HandleLog;
+        }
+
+        static void UnRegisterExceptionHandlers()
+        {
+            AppDomain.CurrentDomain.UnhandledException -= HandleUnhandledException;
+
+            Application.logMessageReceivedThreaded -= HandleLog;
+        }
+
+        static void HandleUnhandledException(object sender, UnhandledExceptionEventArgs args)
+        {
+            Exception ex = (Exception)args.ExceptionObject;
+
+            if (IsExitGUIException(ex) ||
+                !IsPlasticStackTrace(ex.StackTrace))
+                return;
+
+            GUIActionRunner.RunGUIAction(delegate {
+                ExceptionsHandler.HandleException("HandleUnhandledException", ex);
+            });
+        }
+
+        static void HandleLog(string logString, string stackTrace, LogType type)
+        {
+            if (type != LogType.Exception)
+                return;
+
+            if (!IsPlasticStackTrace(stackTrace))
+                return;
+
+            GUIActionRunner.RunGUIAction(delegate {
+                mLog.ErrorFormat("[HandleLog] Unexpected error: {0}", logString);
+                mLog.DebugFormat("Stack trace: {0}", stackTrace);
+
+                string message = logString;
+                if (ExceptionsHandler.DumpStackTrace())
+                    message += Environment.NewLine + stackTrace;
+
+                GuiMessage.ShowError(message);
+            });
+        }
+
+        static void SetupFsWatcher()
+        {
+            if (!PlatformIdentifier.IsMac())
+                return;
+
+            WorkspaceWatcherFsNodeReadersCache.Get().SetMacFsWatcherBuilder(
+                new MacFsWatcherBuilder());
+        }
+
+        static bool IsPlasticStackTrace(string stackTrace)
+        {
+            if (stackTrace == null)
+                return false;
+
+            string[] namespaces = new[] {
+                "Codice.",
+                "GluonGui.",
+                "PlasticGui."
+            };
+
+            return namespaces.Any(stackTrace.Contains);
+        }
+
+        static bool IsExitGUIException(Exception ex)
+        {
+            return ex is ExitGUIException;
+        }
+
+        static bool mIsInitialized;
+
+        static readonly ILog mLog = LogManager.GetLogger("PlasticApp");
+    }
+}
diff --git a/Editor/PlasticSCM/PlasticApp.cs.meta b/Editor/PlasticSCM/PlasticApp.cs.meta
new file mode 100644
index 0000000..031504a
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticApp.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 608f66b5adac272459273ddaf3e4db5d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/PlasticGUIClient.cs b/Editor/PlasticSCM/PlasticGUIClient.cs
new file mode 100644
index 0000000..9ea30fa
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticGUIClient.cs
@@ -0,0 +1,554 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEditor;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using Codice.Client.Commands.CheckIn;
+using Codice.Client.Common;
+using Codice.Client.Common.FsNodeReaders;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using Codice.CM.Common.Replication;
+using GluonGui;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+using PlasticGui.WorkspaceWindow.Replication;
+using PlasticGui.WorkspaceWindow.Update;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.Configuration;
+using Unity.PlasticSCM.Editor.Developer.UpdateReport;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.Views.PendingChanges;
+using Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs;
+using Unity.PlasticSCM.Editor.Views.PendingChanges.PendingMergeLinks;
+
+using GluonNewIncomingChangesUpdater = PlasticGui.Gluon.WorkspaceWindow.NewIncomingChangesUpdater;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal partial class PlasticGUIClient :
+        IPendingChangesView, IWorkspaceWindow, IUpdateReport
+    {
+        internal void SetUpdateNotifierForTesting(UpdateNotifier updateNotifier)
+        {
+            mUpdateNotifierForTesting = updateNotifier;
+        }
+
+        internal void SetMergeLinksForTesting(
+            IDictionary<MountPoint, IList<PendingMergeLink>> mergeLinks)
+        {
+            mPendingMergeLinks = mergeLinks;
+
+            UpdateMergeLinksList();
+        }
+        internal OperationProgressData Progress { get { return mOperationProgressData; } }
+        internal string HeaderTitle { get; private set; }
+        internal string CommentText { get; set; }
+        internal bool KeepItemsLocked { get; set; }
+        internal bool ForceToShowComment { get; set; }
+        internal bool IsCommentWarningNeeded { get; set; }
+        internal string GluonWarningMessage { get; private set; }
+
+        internal Gluon.ProgressOperationHandler GluonProgressOperationHandler
+        {
+            get { return mGluonProgressOperationHandler; }
+        }
+
+        internal PlasticGUIClient(
+            WorkspaceInfo wkInfo,
+            ViewSwitcher switcher,
+            IMergeViewLauncher mergeViewLauncher,
+            ViewHost viewHost,
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges,
+            NewIncomingChangesUpdater developerNewIncomingChangesUpdater,
+            GluonNewIncomingChangesUpdater gluonNewIncomingChangesUpdater,
+            EditorWindow parentWindow,
+            GuiMessage.IGuiMessage guiMessage)
+        {
+            mWkInfo = wkInfo;
+            mSwitcher = switcher;
+            mMergeViewLauncher = mergeViewLauncher;
+            mViewHost = viewHost;
+            mPendingChanges = pendingChanges;
+            mDeveloperNewIncomingChangesUpdater = developerNewIncomingChangesUpdater;
+            mGluonNewIncomingChangesUpdater = gluonNewIncomingChangesUpdater;
+            mPlasticWindow = parentWindow;
+            mGuiMessage = guiMessage;
+
+            ((IWorkspaceWindow)this).UpdateTitle();
+
+            mCheckedStateManager = new CheckedStateManager();
+
+            mDeveloperProgressOperationHandler = new Developer.ProgressOperationHandler(mWkInfo, this);
+            mGluonProgressOperationHandler = new Gluon.ProgressOperationHandler(this);
+        }
+
+        internal void RegisterPendingChangesGuiControls(
+            ProgressControlsForViews progressControls,
+            PendingChangesTreeView changesTreeView,
+            MergeLinksListView mergeLinksListView)
+        {
+            mProgressControls = progressControls;
+            mChangesTreeView = changesTreeView;
+            mMergeLinksListView = mergeLinksListView;
+
+            mPendingChangesOperations = new PendingChangesOperations(
+                mWkInfo, this, mSwitcher, mMergeViewLauncher,
+                this, mProgressControls, this, null, null, null);
+        }
+
+        internal bool HasPendingMergeLinks()
+        {
+            if (mPendingMergeLinks == null)
+                return false;
+
+            return mPendingMergeLinks.Count > 0;
+        }
+
+        internal void UpdateIsCommentWarningNeeded(string comment)
+        {
+            IsCommentWarningNeeded = string.IsNullOrEmpty(comment)
+                && mPendingChanges.HasPendingChanges();
+        }
+
+        internal bool IsOperationInProgress()
+        {
+            return mDeveloperProgressOperationHandler.IsOperationInProgress()
+                || mGluonProgressOperationHandler.IsOperationInProgress();
+        }
+
+        internal bool IsRefreshing()
+        {
+            return mIsRefreshing;
+        }
+
+        internal void CancelCurrentOperation()
+        {
+            if (mDeveloperProgressOperationHandler.IsOperationInProgress())
+            {
+                mDeveloperProgressOperationHandler.CancelCheckinProgress();
+                return;
+            }
+
+            if (mGluonProgressOperationHandler.IsOperationInProgress())
+            {
+                mGluonProgressOperationHandler.CancelUpdateProgress();
+                return;
+            }
+        }
+
+        internal void Checkin()
+        {
+            List<ChangeInfo> changesToCheckin;
+            List<ChangeInfo> dependenciesCandidates;
+
+            mChangesTreeView.GetCheckedChanges(
+                false, out changesToCheckin, out dependenciesCandidates);
+
+            if (CheckEmptyOperation(changesToCheckin, HasPendingMergeLinks()))
+            {
+                mProgressControls.ShowWarning(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.NoItemsAreSelected));
+                return;
+            }
+
+            bool isCancelled;
+            SaveAssets.ForChangesWithConfirmation(changesToCheckin, out isCancelled);
+
+            if (isCancelled)
+                return;
+
+            mPendingChangesOperations.Checkin(
+                changesToCheckin,
+                dependenciesCandidates,
+                CommentText,
+                null,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        internal void Undo()
+        {
+            List<ChangeInfo> changesToUndo;
+            List<ChangeInfo> dependenciesCandidates;
+
+            mChangesTreeView.GetCheckedChanges(
+                true, out changesToUndo, out dependenciesCandidates);
+
+            UndoChanges(changesToUndo, dependenciesCandidates);
+        }
+
+        internal void UndoChanges(
+            List<ChangeInfo> changesToUndo,
+            List<ChangeInfo> dependenciesCandidates)
+        {
+            if (CheckEmptyOperation(changesToUndo, HasPendingMergeLinks()))
+            {
+                mProgressControls.ShowWarning(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.NoItemsToUndo));
+                return;
+            }
+
+            SaveAssets.ForChangesWithoutConfirmation(changesToUndo);
+
+            mPendingChangesOperations.Undo(
+                changesToUndo,
+                dependenciesCandidates,
+                mPendingMergeLinks.Count,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        internal void UpdateWorkspace()
+        {
+            UpdateWorkspaceOperation update = new UpdateWorkspaceOperation(
+                mWkInfo, this, mSwitcher, mMergeViewLauncher, this,
+                mDeveloperNewIncomingChangesUpdater,
+                null);
+
+            update.Run(
+                UpdateWorkspaceOperation.UpdateType.UpdateToLatest,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        internal void GetPendingChanges(INewChangesInWk newChangesInWk)
+        {
+            if (mDeveloperNewIncomingChangesUpdater != null)
+                mDeveloperNewIncomingChangesUpdater.Update();
+
+            if (mGluonNewIncomingChangesUpdater != null)
+                mGluonNewIncomingChangesUpdater.Update(DateTime.Now);
+
+            FillPendingChanges(newChangesInWk);
+        }
+
+        internal void OnParentUpdated(double elapsedSeconds)
+        {
+            if (IsOperationInProgress() || mRequestedRepaint)
+            {
+                if (mDeveloperProgressOperationHandler.IsOperationInProgress())
+                    mDeveloperProgressOperationHandler.Update(elapsedSeconds);
+
+                mPlasticWindow.Repaint();
+
+                mRequestedRepaint = false;
+            }
+        }
+
+        void FillPendingChanges(INewChangesInWk newChangesInWk)
+        {
+            if (mIsRefreshing)
+                return;
+
+            mIsRefreshing = true;
+
+            List<ChangeInfo> changesToSelect =
+                PendingChangesSelection.GetChangesToFocus(mChangesTreeView);
+
+            mProgressControls.ShowProgress(PlasticLocalization.GetString(
+                PlasticLocalization.Name.LoadingPendingChanges));
+
+            IDictionary<MountPoint, IList<PendingMergeLink>> mergeLinks = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter();
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    FilterManager.Get().Reload();
+
+                    WorkspaceStatusOptions options = WorkspaceStatusOptions.None;
+                    options |= WorkspaceStatusOptions.FindAdded;
+                    options |= WorkspaceStatusOptions.FindDeleted;
+                    options |= WorkspaceStatusOptions.FindMoved;
+                    options |= WorkspaceStatusOptions.SplitModifiedMoved;
+                    options |= PendingChangesOptions.GetWorkspaceStatusOptions();
+
+                    if (newChangesInWk != null)
+                        newChangesInWk.Detected();
+
+                    mPendingChanges.Calculate(
+                        options, PendingChangesOptions.GetMovedMatchingOptions());
+
+                    mergeLinks = Plastic.API.GetPendingMergeLinks(mWkInfo);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    mPendingMergeLinks = mergeLinks;
+
+                    try
+                    {
+                        if (waiter.Exception != null)
+                        {
+                            ExceptionsHandler.DisplayException(waiter.Exception);
+                            return;
+                        }
+
+                        UpdateChangesTree();
+
+                        UpdateMergeLinksList();
+
+                        PendingChangesSelection.SelectChanges(
+                            mChangesTreeView, changesToSelect);
+                    }
+                    finally
+                    {
+                        mProgressControls.HideProgress();
+
+                        UpdateIsCommentWarningNeeded(CommentText);
+
+                        UpdateNotificationPanel();
+
+                        mIsRefreshing = false;
+                    }
+                });
+        }
+
+        void UpdateChangesTree()
+        {
+            mChangesTreeView.BuildModel(mPendingChanges, mCheckedStateManager);
+
+            mChangesTreeView.Refilter();
+
+            mChangesTreeView.Sort();
+
+            mChangesTreeView.Reload();
+        }
+
+        void UpdateMergeLinksList()
+        {
+            mMergeLinksListView.BuildModel(mPendingMergeLinks);
+
+            mMergeLinksListView.Reload();
+        }
+
+        void UpdateNotificationPanel()
+        {
+            if (Plastic.API.IsFsReaderWatchLimitReached(mWkInfo))
+            {
+                mProgressControls.ShowWarning(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.NotifyLinuxWatchLimitWarning));
+                return;
+            }
+        }
+
+        void IUpdateReport.Show(WorkspaceInfo wkInfo, IList reportLines)
+        {
+            UpdateReportDialog.ShowReportDialog(
+                wkInfo,
+                reportLines,
+                mPlasticWindow);
+        }
+
+        void IWorkspaceWindow.RefreshView(ViewType viewType)
+        {
+            mSwitcher.RefreshView(viewType);
+        }
+
+        void IWorkspaceWindow.UpdateTitle()
+        {
+            string title = string.Empty;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter();
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    title = GetTitle(mWkInfo);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    if (waiter.Exception != null)
+                        return;
+
+                    HeaderTitle = title;
+
+                    RequestRepaint();
+                });
+        }
+
+        bool IWorkspaceWindow.CheckOperationInProgress()
+        {
+            return mDeveloperProgressOperationHandler.CheckOperationInProgress();
+        }
+
+        void IWorkspaceWindow.ShowUpdateProgress(string title, UpdateNotifier notifier)
+        {
+            mDeveloperProgressOperationHandler.ShowUpdateProgress(title, mUpdateNotifierForTesting ?? notifier);
+        }
+
+        void IWorkspaceWindow.EndUpdateProgress()
+        {
+            mDeveloperProgressOperationHandler.EndUpdateProgress();
+        }
+
+        void IWorkspaceWindow.ShowCheckinProgress()
+        {
+            mDeveloperProgressOperationHandler.ShowCheckinProgress();
+        }
+
+        void IWorkspaceWindow.EndCheckinProgress()
+        {
+            mDeveloperProgressOperationHandler.EndCheckinProgress();
+        }
+
+        void IWorkspaceWindow.RefreshCheckinProgress(
+            CheckinStatus checkinStatus,
+            BuildProgressSpeedAndRemainingTime.ProgressData progressData)
+        {
+            mDeveloperProgressOperationHandler.
+                RefreshCheckinProgress(checkinStatus, progressData);
+        }
+
+        bool IWorkspaceWindow.HasCheckinCancelled()
+        {
+            return mDeveloperProgressOperationHandler.HasCheckinCancelled();
+        }
+
+        void IWorkspaceWindow.ShowReplicationProgress(IReplicationOperation replicationOperation)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IWorkspaceWindow.RefreshReplicationProgress(BranchReplicationData replicationData, ReplicationStatus replicationStatus, int current, int total)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IWorkspaceWindow.EndReplicationProgress(ReplicationStatus replicationStatus)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IWorkspaceWindow.ShowProgress()
+        {
+            mDeveloperProgressOperationHandler.ShowProgress();
+        }
+
+        void IWorkspaceWindow.ShowProgress(IProgressOperation progressOperation)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IWorkspaceWindow.RefreshProgress(ProgressData progressData)
+        {
+            mDeveloperProgressOperationHandler.RefreshProgress(progressData);
+        }
+
+        void IWorkspaceWindow.EndProgress()
+        {
+            mDeveloperProgressOperationHandler.EndProgress();
+        }
+
+        EncryptionConfigurationDialogData IWorkspaceWindow.RequestEncryptionPassword(string server)
+        {
+            return EncryptionConfigurationDialog.RequestEncryptionPassword(server, mPlasticWindow);
+        }
+
+        void IPendingChangesView.ClearChangesToCheck(List<string> changes)
+        {
+            mCheckedStateManager.ClearChangesToCheck(changes);
+            RequestRepaint();
+        }
+
+        void IPendingChangesView.CleanCheckedElements(List<ChangeInfo> checkedChanges)
+        {
+            mCheckedStateManager.Clean(checkedChanges);
+            RequestRepaint();
+        }
+
+        void IPendingChangesView.CheckChanges(List<string> changesToCheck)
+        {
+            mCheckedStateManager.SetChangesToCheck(changesToCheck);
+            RequestRepaint();
+        }
+
+        bool IPendingChangesView.IncludeDependencies(
+            IList<ChangeDependencies<ChangeInfo>> changesDependencies,
+            string operation)
+        {
+            return DependenciesDialog.IncludeDependencies(
+                mWkInfo, changesDependencies, operation, mPlasticWindow);
+        }
+
+        CheckinMergeNeededData IPendingChangesView.CheckinMergeNeeded()
+        {
+            return CheckinMergeNeededDialog.Merge(mWkInfo, mPlasticWindow);
+        }
+
+        void IPendingChangesView.ClearComments()
+        {
+            ClearComments();
+        }
+
+        SearchMatchesData IPendingChangesView.AskForMatches(string changePath)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPendingChangesView.CleanLinkedTasks()
+        {
+        }
+
+        internal void RequestRepaint()
+        {
+            mRequestedRepaint = true;
+        }
+
+        void ClearComments()
+        {
+            CommentText = string.Empty;
+            ForceToShowComment = true;
+            RequestRepaint();
+        }
+
+        static string GetTitle(WorkspaceInfo wkInfo)
+        {
+            WorkspaceStatusString.Data wkStatusData =
+                WorkspaceStatusString.GetSelectorData(wkInfo);
+
+            return string.Format("{0} {1} @ {2} @ {3}",
+                wkStatusData.ObjectName,
+                wkStatusData.ObjectSpec,
+                wkStatusData.RepositoryName,
+                wkStatusData.Server);
+        }
+
+        static bool CheckEmptyOperation(List<ChangeInfo> elements, bool bHasPendingMergeLinks)
+        {
+            if (bHasPendingMergeLinks)
+                return false;
+
+            if (elements != null && elements.Count > 0)
+                return false;
+
+            return true;
+        }
+
+        bool mIsRefreshing;
+        bool mRequestedRepaint;
+
+        UpdateNotifier mUpdateNotifierForTesting;
+
+        OperationProgressData mOperationProgressData = new OperationProgressData();
+        IProgressControls mProgressControls;
+        IDictionary<MountPoint, IList<PendingMergeLink>> mPendingMergeLinks;
+        PendingChangesTreeView mChangesTreeView;
+        MergeLinksListView mMergeLinksListView;
+        PendingChangesOperations mPendingChangesOperations;
+
+        readonly GluonNewIncomingChangesUpdater mGluonNewIncomingChangesUpdater;
+        readonly NewIncomingChangesUpdater mDeveloperNewIncomingChangesUpdater;
+        readonly PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges mPendingChanges;
+        readonly Developer.ProgressOperationHandler mDeveloperProgressOperationHandler;
+        readonly CheckedStateManager mCheckedStateManager;
+        readonly Gluon.ProgressOperationHandler mGluonProgressOperationHandler;
+        readonly GuiMessage.IGuiMessage mGuiMessage;
+        readonly EditorWindow mPlasticWindow;
+        readonly ViewSwitcher mSwitcher;
+        readonly IMergeViewLauncher mMergeViewLauncher;
+        readonly ViewHost mViewHost;
+        readonly WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/PlasticGUIClient.cs.meta b/Editor/PlasticSCM/PlasticGUIClient.cs.meta
new file mode 100644
index 0000000..e04f2cb
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticGUIClient.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 30e9a0b4c58f24512803e160e0216686
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/PlasticGUIClient_Gluon.cs b/Editor/PlasticSCM/PlasticGUIClient_Gluon.cs
new file mode 100644
index 0000000..0dc40cd
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticGUIClient_Gluon.cs
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Common;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using GluonGui;
+using GluonGui.WorkspaceWindow.Views;
+using GluonGui.WorkspaceWindow.Views.Checkin.Operations;
+using GluonGui.WorkspaceWindow.Views.WorkspaceExplorer.Explorer;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.Gluon.UpdateReport;
+using Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs;
+
+using IGluonUpdateReport = PlasticGui.Gluon.IUpdateReport;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal partial class PlasticGUIClient :
+        CheckinUIOperation.ICheckinView, IGluonUpdateReport
+    {
+        internal void PartialCheckin(bool keepItemsLocked)
+        {
+            List<ChangeInfo> changesToCheckin;
+            List<ChangeInfo> dependenciesCandidates;
+
+            mChangesTreeView.GetCheckedChanges(
+                false, out changesToCheckin, out dependenciesCandidates);
+
+            if (CheckEmptyOperation(changesToCheckin))
+            {
+                mProgressControls.ShowWarning(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.NoItemsAreSelected));
+                return;
+            }
+
+            bool isCancelled;
+            SaveAssets.ForChangesWithConfirmation(changesToCheckin, out isCancelled);
+
+            if (isCancelled)
+                return;
+
+            CheckinUIOperation ciOperation = new CheckinUIOperation(
+                mWkInfo, mViewHost, mProgressControls, mGuiMessage,
+                new LaunchCheckinConflictsDialog(mPlasticWindow),
+                new LaunchDependenciesDialog(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.CheckinButton),
+                    mPlasticWindow),
+                this, mGluonProgressOperationHandler);
+
+            ciOperation.Checkin(
+                changesToCheckin,
+                dependenciesCandidates,
+                CommentText,
+                keepItemsLocked,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        internal void PartialUndo()
+        {
+            List<ChangeInfo> changesToUndo;
+            List<ChangeInfo> dependenciesCandidates;
+
+            mChangesTreeView.GetCheckedChanges(
+                true, out changesToUndo, out dependenciesCandidates);
+
+            PartialUndoChanges(changesToUndo, dependenciesCandidates);
+        }
+
+        internal void PartialUndoChanges(
+            List<ChangeInfo> changesToUndo,
+            List<ChangeInfo> dependenciesCandidates)
+        {
+            if (CheckEmptyOperation(changesToUndo))
+            {
+                mProgressControls.ShowWarning(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.NoItemsToUndo));
+                return;
+            }
+
+            SaveAssets.ForChangesWithoutConfirmation(changesToUndo);
+
+            UndoUIOperation undoOperation = new UndoUIOperation(
+                mWkInfo, mViewHost,
+                new LaunchDependenciesDialog(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.UndoButton),
+                    mPlasticWindow),
+                mProgressControls, mGuiMessage);
+
+            undoOperation.Undo(
+                changesToUndo,
+                dependenciesCandidates,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        internal void PartialUpdateWorkspace()
+        {
+            mProgressControls.ShowProgress(PlasticLocalization.GetString(
+                PlasticLocalization.Name.UpdatingWorkspace));
+
+            ((IUpdateProgress)mGluonProgressOperationHandler).ShowCancelableProgress();
+
+            OutOfDateUpdater outOfDateUpdater = new OutOfDateUpdater(mWkInfo);
+
+            BuildProgressSpeedAndRemainingTime.ProgressData progressData =
+                new BuildProgressSpeedAndRemainingTime.ProgressData(DateTime.Now);
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter();
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    outOfDateUpdater.Execute();
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    mProgressControls.HideProgress();
+
+                    ((IUpdateProgress)mGluonProgressOperationHandler).EndProgress();
+
+                    mViewHost.RefreshView(ViewType.CheckinView);
+                    mViewHost.RefreshView(ViewType.IncomingChangesView);
+
+                    RefreshAsset.UnityAssetDatabase();
+
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.DisplayException(waiter.Exception);
+                        return;
+                    }
+
+                    ShowUpdateReportDialog(
+                        mWkInfo, mViewHost, outOfDateUpdater.Progress, mProgressControls,
+                        mGuiMessage, mGluonProgressOperationHandler, this);
+                },
+                /*timerTickDelegate*/ delegate
+                {
+                    UpdateProgress progress = outOfDateUpdater.Progress;
+
+                    if (progress == null)
+                        return;
+
+                    if (progress.IsCanceled)
+                    {
+                        mProgressControls.ShowNotification(
+                            PlasticLocalization.GetString(PlasticLocalization.Name.Canceling));
+                    }
+
+                    ((IUpdateProgress)mGluonProgressOperationHandler).RefreshProgress(
+                        progress,
+                        UpdateProgressDataCalculator.CalculateProgressForWorkspaceUpdate(
+                            mWkInfo.ClientPath, progress, progressData));
+                });
+        }
+
+        static void ShowUpdateReportDialog(
+            WorkspaceInfo wkInfo,
+            ViewHost viewHost,
+            UpdateProgress progress,
+            IProgressControls progressControls,
+            GuiMessage.IGuiMessage guiMessage,
+            IUpdateProgress updateProgress,
+            IGluonUpdateReport updateReport)
+        {
+            if (progress.ErrorMessages.Count == 0)
+                return;
+
+            UpdateReportResult updateReportResult =
+                updateReport.ShowUpdateReport(wkInfo, progress.ErrorMessages);
+
+            if (!updateReportResult.IsUpdateForcedRequested())
+                return;
+
+            UpdateForcedOperation updateForced = new UpdateForcedOperation(
+                wkInfo, viewHost, progress, progressControls,
+                guiMessage, updateProgress, updateReport);
+
+            updateForced.UpdateForced(
+                updateReportResult.UpdateForcedPaths,
+                updateReportResult.UnaffectedErrors);
+        }
+
+        void CheckinUIOperation.ICheckinView.ClearComments()
+        {
+            ClearComments();
+        }
+
+        void CheckinUIOperation.ICheckinView.CollapseWarningMessagePanel()
+        {
+            GluonWarningMessage = string.Empty;
+            RequestRepaint();
+        }
+
+        void CheckinUIOperation.ICheckinView.ExpandWarningMessagePanel(string text)
+        {
+            GluonWarningMessage = text;
+            RequestRepaint();
+        }
+
+        static bool CheckEmptyOperation(List<ChangeInfo> elements)
+        {
+            return elements == null || elements.Count == 0;
+        }
+
+        UpdateReportResult IGluonUpdateReport.ShowUpdateReport(
+            WorkspaceInfo wkInfo, List<ErrorMessage> errors)
+        {
+            return UpdateReportDialog.ShowUpdateReport(
+                wkInfo, errors, mPlasticWindow);
+        }
+
+        void IGluonUpdateReport.AppendReport(string updateReport)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/PlasticGUIClient_Gluon.cs.meta b/Editor/PlasticSCM/PlasticGUIClient_Gluon.cs.meta
new file mode 100644
index 0000000..2ef2aa3
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticGUIClient_Gluon.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6ef3a0486f9ad4b9da7aba5d79f27005
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/PlasticMenuItem.cs b/Editor/PlasticSCM/PlasticMenuItem.cs
new file mode 100644
index 0000000..e0f0330
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticMenuItem.cs
@@ -0,0 +1,30 @@
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class PlasticMenuItem
+    {
+        internal static void Add()
+        {
+            HandleMenuItem.AddMenuItem(
+                MENU_ITEM_NAME, MENU_ITEM_PRIORITY,
+                ShowPanel, ValidateMenu);
+
+            HandleMenuItem.UpdateAllMenus();
+        }
+
+        static bool ValidateMenu()
+        {
+            return !CollabPlugin.IsEnabled();
+        }
+
+        static void ShowPanel()
+        {
+            ShowWindow.Plastic();
+        }
+
+        const string MENU_ITEM_NAME = "Window/" + UnityConstants.PLASTIC_WINDOW_TITLE;
+
+        const int MENU_ITEM_PRIORITY = 1000;
+    }
+}
diff --git a/Editor/PlasticSCM/PlasticMenuItem.cs.meta b/Editor/PlasticSCM/PlasticMenuItem.cs.meta
new file mode 100644
index 0000000..a3e205f
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticMenuItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ca17c170df6db5042b70adc65fbe770c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/PlasticWindow.cs b/Editor/PlasticSCM/PlasticWindow.cs
new file mode 100644
index 0000000..05f10bf
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticWindow.cs
@@ -0,0 +1,866 @@
+using System;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.BaseCommands.EventTracking;
+using Codice.Client.Common;
+using Codice.Client.Common.Encryption;
+using Codice.Client.Common.EventTracking;
+using Codice.Client.Common.FsNodeReaders;
+using Codice.Client.Common.FsNodeReaders.Watcher;
+using Codice.Client.Common.Threading;
+using Codice.Client.Common.WebApi;
+using Codice.CM.Common;
+using Codice.LogWrapper;
+using CodiceApp.EventTracking;
+using GluonGui;
+using PlasticGui;
+using PlasticGui.Gluon;
+using PlasticGui.WebApi;
+using Unity.PlasticSCM.Editor.AssetMenu;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.AssetsOverlays;
+using Unity.PlasticSCM.Editor.AssetUtils.Processor;
+using Unity.PlasticSCM.Editor.Configuration;
+using Unity.PlasticSCM.Editor.Inspector;
+using Unity.PlasticSCM.Editor.Tool;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Avatar;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.Views.CreateWorkspace;
+using Unity.PlasticSCM.Editor.Views.Welcome;
+
+using GluonCheckIncomingChanges = PlasticGui.Gluon.WorkspaceWindow.CheckIncomingChanges;
+using GluonNewIncomingChangesUpdater = PlasticGui.Gluon.WorkspaceWindow.NewIncomingChangesUpdater;
+using EventTracking = PlasticGui.EventTracking.EventTracking;
+using Codice.Client.Common.Connection;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal class PlasticWindow : EditorWindow,
+        PlasticGui.WorkspaceWindow.CheckIncomingChanges.IAutoRefreshIncomingChangesView,
+        GluonCheckIncomingChanges.IAutoRefreshIncomingChangesView,
+        CreateWorkspaceView.ICreateWorkspaceListener
+    {
+        internal PlasticGUIClient PlasticClientForTesting { get { return mPlasticClient; } }
+        internal ViewSwitcher ViewSwitcherForTesting { get { return mViewSwitcher; } }
+        internal IPlasticAPI PlasticApiForTesting { get { return mPlasticAPI; } }
+        internal IPlasticWebRestApi PlasticWebRestApiForTesting { get { return mPlasticWebRestApi; } }
+
+        internal void SetupWindowTitle()
+        {
+            titleContent = new GUIContent(
+                UnityConstants.PLASTIC_WINDOW_TITLE,
+                Images.GetImage(Images.Name.IconPlasticView));
+        }
+
+        internal void DisableCollabIfEnabledWhenLoaded()
+        {
+            mDisableCollabIfEnabledWhenLoaded = true;
+        }
+
+        void PlasticGui.WorkspaceWindow.CheckIncomingChanges.IAutoRefreshIncomingChangesView.IfVisible()
+        {
+            mViewSwitcher.AutoRefreshIncomingChangesView();
+        }
+
+        void GluonCheckIncomingChanges.IAutoRefreshIncomingChangesView.IfVisible()
+        {
+            mViewSwitcher.AutoRefreshIncomingChangesView();
+        }
+
+        void CreateWorkspaceView.ICreateWorkspaceListener.OnWorkspaceCreated(
+            WorkspaceInfo wkInfo, bool isGluonMode)
+        {
+            mWkInfo = wkInfo;
+            mIsGluonMode = isGluonMode;
+            mWelcomeView = null;
+
+            if (mIsGluonMode)
+                ConfigurePartialWorkspace.AsFullyChecked(mWkInfo);
+
+            InitializePlastic();
+            Repaint();
+        }
+
+        void OnEnable()
+        {
+            wantsMouseMove = true;
+
+            if (mException != null)
+                return;
+
+            SetupWindowTitle();
+
+            GuiMessage.Initialize(new UnityPlasticGuiMessage(this));
+
+            PlasticApp.InitializeIfNeeded();
+
+            RegisterApplicationFocusHandlers(this);
+
+            PlasticMethodExceptionHandling.InitializeAskCredentialsUi(
+                new CredentialsUiImpl(this));
+            ClientEncryptionServiceProvider.SetEncryptionPasswordProvider(
+                new MissingEncryptionPasswordPromptHandler(this));
+
+            mPlasticAPI = new PlasticAPI();
+            mPlasticWebRestApi = new PlasticWebRestApi();
+
+            mEventSenderScheduler = EventTracking.Configure(
+                mPlasticWebRestApi,
+                ApplicationIdentifier.UnityPackage,
+                IdentifyEventPlatform.Get());
+
+            if (mEventSenderScheduler != null)
+            {
+                mPingEventLoop = new PingEventLoop();
+                mPingEventLoop.Start();
+            }
+
+            InitializePlastic();
+        }
+
+        void OnDisable()
+        {
+            AssetsProcessors.Disable();
+
+            if (mWkInfo != null)
+            {
+                MonoFileSystemWatcher.IsEnabled = false;
+                WorkspaceFsNodeReaderCachesCleaner.CleanWorkspaceFsNodeReader(mWkInfo);
+            }
+
+            if (mException != null)
+                return;
+
+            if (mWkInfo == null)
+            {
+                ClosePlasticWindow(this);
+                return;
+            }
+
+            mViewSwitcher.OnDisable();
+
+            ClosePlasticWindow(this);
+        }
+
+        void OnDestroy()
+        {
+            if (mException != null)
+                return;
+
+            if (mWkInfo == null)
+                return;
+
+            if (!mPlasticClient.IsOperationInProgress())
+                return;
+
+            bool bCloseWindow = GuiMessage.ShowQuestion(
+                PlasticLocalization.GetString(PlasticLocalization.Name.OperationRunning),
+                PlasticLocalization.GetString(PlasticLocalization.Name.ConfirmClosingRunningOperation),
+                PlasticLocalization.GetString(PlasticLocalization.Name.YesButton));
+
+            if (bCloseWindow)
+                return;
+
+            mForceToOpen = true;
+            ShowPlasticWindow(this);
+        }
+
+        void OnFocus()
+        {
+            if (mException != null)
+                return;
+
+            if (mWkInfo == null)
+                return;
+
+            mViewSwitcher.AutoRefreshPendingChangesView();
+            mViewSwitcher.AutoRefreshIncomingChangesView();
+        }
+
+        void OnGUI()
+        {
+            if (mException != null)
+            {
+                DoExceptionErrorArea();
+                return;
+            }
+
+            try
+            {
+                // IMPORTANT: disable collab (if needed)
+                // must be executed before the next if statement
+                // where we check if collab is enabled
+                if (mDisableCollabIfEnabledWhenLoaded)
+                {
+                    mDisableCollabIfEnabledWhenLoaded = false;
+                    DisableCollabIfEnabled(ProjectPath.FromApplicationDataPath(
+                        Application.dataPath));
+                }
+
+                if (CollabPlugin.IsEnabled())
+                {
+                    // execute Close() once after all inspectors update
+                    // to avoid our window to be drawn in back color
+                    EditorApplication.delayCall = Close;
+                    return;
+                }
+
+                bool isPlasticExeAvailable = IsExeAvailable.ForMode(mIsGluonMode);
+                bool clientNeedsConfiguration = UnityConfigurationChecker.NeedsConfiguration();
+
+                if (NeedsToDisplayWelcomeView(
+                        isPlasticExeAvailable,
+                        clientNeedsConfiguration,
+                        mWkInfo))
+                {
+                    GetWelcomeView().OnGUI(
+                        isPlasticExeAvailable,
+                        clientNeedsConfiguration,
+                        mIsGluonMode);
+                    return;
+                }
+
+                DoHeader(
+                    mWkInfo,
+                    mPlasticClient,
+                    mViewSwitcher,
+                    mViewSwitcher,
+                    mIsGluonMode,
+                    mIncomingChangesNotificationPanel);
+
+                DoTabToolbar(
+                    mWkInfo,
+                    mPlasticClient,
+                    mViewSwitcher,
+                    mIsGluonMode);
+
+                mViewSwitcher.TabViewGUI();
+
+                if (mPlasticClient.IsOperationInProgress())
+                    DrawProgressForOperations.For(
+                        mPlasticClient, mPlasticClient.Progress,
+                        position.width);
+            }
+            catch (Exception ex)
+            {
+                if (IsExitGUIException(ex))
+                    throw;
+
+                GUI.enabled = true;
+
+                if (IsIMGUIPaintException(ex))
+                {
+                    ExceptionsHandler.LogException("PlasticWindow", ex);
+                    return;
+                }
+
+                mException = ex;
+
+                DoExceptionErrorArea();
+
+                ExceptionsHandler.HandleException("OnGUI", ex);
+            }
+        }
+
+        void Update()
+        {
+            if (mException != null)
+                return;
+
+            if (mWkInfo == null)
+                return;
+
+            try
+            {
+                double currentUpdateTime = EditorApplication.timeSinceStartup;
+                double elapsedSeconds = currentUpdateTime - mLastUpdateTime;
+
+                mViewSwitcher.Update();
+                mPlasticClient.OnParentUpdated(elapsedSeconds);
+
+                if (mWelcomeView != null)
+                    mWelcomeView.Update();
+
+                mLastUpdateTime = currentUpdateTime;
+            }
+            catch (Exception ex)
+            {
+                mException = ex;
+
+                ExceptionsHandler.HandleException("Update", ex);
+            }
+        }
+
+        void InitializePlastic()
+        {
+            if (mForceToOpen)
+            {
+                mForceToOpen = false;
+                return;
+            }
+
+            try
+            {
+                if (UnityConfigurationChecker.NeedsConfiguration())
+                    return;
+
+                mWkInfo = FindWorkspace.InfoForApplicationPath(
+                    Application.dataPath, mPlasticAPI);
+
+                if (mWkInfo == null)
+                {
+                    AssetMenuItems.Disable();
+                    return;
+                }
+
+                MonoFileSystemWatcher.IsEnabled = true;
+
+                SetupCloudProjectIdIfNeeded(mWkInfo, mPlasticAPI);
+
+                DisableVCSIfEnabled(mWkInfo.ClientPath);
+
+                mIsGluonMode = mPlasticAPI.IsGluonWorkspace(mWkInfo);
+
+                IAssetStatusCache assetStatusCache =
+                    new AssetStatusCache(
+                        mWkInfo,
+                        mIsGluonMode,
+                        RepaintProjectWindow);
+
+                AssetsProcessors.Enable(
+                    mPlasticAPI,
+                    assetStatusCache);
+
+                if (mEventSenderScheduler != null)
+                {
+                    mPingEventLoop.SetWorkspace(mWkInfo);
+                    ((IPlasticWebRestApi)mPlasticWebRestApi).SetToken(
+                        CmConnection.Get().BuildWebApiTokenForCloudEditionDefaultUser());
+                }
+
+                InitializeNewIncomingChanges(mWkInfo, mIsGluonMode);
+
+                ViewHost viewHost = new ViewHost();
+
+                PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                    new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(mWkInfo);
+
+                mViewSwitcher = new ViewSwitcher(
+                    mWkInfo,
+                    viewHost,
+                    mIsGluonMode,
+                    pendingChanges,
+                    mDeveloperNewIncomingChangesUpdater,
+                    mGluonNewIncomingChangesUpdater,
+                    mIncomingChangesNotificationPanel,
+                    assetStatusCache,
+                    this);
+
+                mCooldownAutoRefreshPendingChangesAction = new CooldownWindowDelayer(
+                    mViewSwitcher.AutoRefreshPendingChangesView,
+                    UnityConstants.AUTO_REFRESH_PENDING_CHANGES_DELAYED_INTERVAL);
+
+                mPlasticClient = new PlasticGUIClient(
+                    mWkInfo,
+                    mViewSwitcher,
+                    mViewSwitcher,
+                    viewHost,
+                    pendingChanges,
+                    mDeveloperNewIncomingChangesUpdater,
+                    mGluonNewIncomingChangesUpdater,
+                    this,
+                    new UnityPlasticGuiMessage(this));
+
+                mViewSwitcher.SetPlasticGUIClient(mPlasticClient);
+                mViewSwitcher.ShowInitialView();
+
+                UnityStyles.Initialize(Repaint);
+
+                AssetOperations.IAssetSelection inspectorAssetSelection =
+                    new InspectorAssetSelection();
+
+                AssetOperations.IAssetSelection projectViewAssetSelection =
+                    new ProjectViewAssetSelection();
+
+                AssetOperations inspectorAssetOperations =
+                    new AssetOperations(
+                        mWkInfo,
+                        mPlasticClient,
+                        mViewSwitcher,
+                        mViewSwitcher,
+                        viewHost,
+                        mDeveloperNewIncomingChangesUpdater,
+                        assetStatusCache,
+                        mViewSwitcher,
+                        mViewSwitcher,
+                        this,
+                        inspectorAssetSelection,
+                        mIsGluonMode);
+
+                AssetOperations projectViewAssetOperations =
+                    new AssetOperations(
+                        mWkInfo,
+                        mPlasticClient,
+                        mViewSwitcher,
+                        mViewSwitcher,
+                        viewHost,
+                        mDeveloperNewIncomingChangesUpdater,
+                        assetStatusCache,
+                        mViewSwitcher,
+                        mViewSwitcher,
+                        this,
+                        projectViewAssetSelection,
+                        mIsGluonMode);
+
+                AssetMenuItems.Enable(
+                    projectViewAssetOperations,
+                    assetStatusCache,
+                    projectViewAssetSelection);
+
+                DrawInspectorOperations.Enable(
+                    inspectorAssetOperations,
+                    assetStatusCache,
+                    inspectorAssetSelection);
+
+                DrawAssetOverlay.Initialize(
+                    assetStatusCache,
+                    RepaintProjectWindow);
+
+                mLastUpdateTime = EditorApplication.timeSinceStartup;
+            }
+            catch (Exception ex)
+            {
+                mException = ex;
+
+                ExceptionsHandler.HandleException("InitializePlastic", ex);
+            }
+        }
+
+        void InitializeNewIncomingChanges(
+            WorkspaceInfo wkInfo,
+            bool bIsGluonMode)
+        {
+            if (bIsGluonMode)
+            {
+                Gluon.IncomingChangesNotificationPanel gluonPanel =
+                    new Gluon.IncomingChangesNotificationPanel(this);
+                mGluonNewIncomingChangesUpdater =
+                    NewIncomingChanges.BuildUpdaterForGluon(
+                        wkInfo,
+                        this,
+                        gluonPanel,
+                        new GluonCheckIncomingChanges.CalculateIncomingChanges());
+                mIncomingChangesNotificationPanel = gluonPanel;
+                return;
+            }
+
+            Developer.IncomingChangesNotificationPanel developerPanel =
+                new Developer.IncomingChangesNotificationPanel(this);
+            mDeveloperNewIncomingChangesUpdater =
+                NewIncomingChanges.BuildUpdaterForDeveloper(
+                    wkInfo, this, developerPanel);
+            mIncomingChangesNotificationPanel = developerPanel;
+        }
+
+        void OnApplicationActivated()
+        {
+            if (mException != null)
+                return;
+
+            Reload.IfWorkspaceConfigChanged(
+                mPlasticAPI, mWkInfo, mIsGluonMode,
+                ExecuteFullReload);
+
+            if (mWkInfo == null)
+                return;
+
+            ((IWorkspaceWindow)mPlasticClient).UpdateTitle();
+
+            NewIncomingChanges.LaunchUpdater(
+                mDeveloperNewIncomingChangesUpdater,
+                mGluonNewIncomingChangesUpdater);
+
+            // When Unity Editor window is activated it writes some files to its Temp folder.
+            // This causes the fswatcher to process those events. 
+            // We need to wait until the fswatcher finishes processing the events,
+            // otherwise the NewChangesInWk method will return TRUE, causing
+            // the pending changes view to unwanted auto-refresh.
+            // So, we need to delay the auto-refresh call in order
+            // to give the fswatcher enough time to process the events.
+            // Note that the OnFocus event is not affected by this issue.
+            mCooldownAutoRefreshPendingChangesAction.Ping();
+
+            mViewSwitcher.AutoRefreshIncomingChangesView();
+        }
+
+        void OnApplicationDeactivated()
+        {
+            if (mException != null)
+                return;
+
+            if (mWkInfo == null)
+                return;
+
+            NewIncomingChanges.StopUpdater(
+                mDeveloperNewIncomingChangesUpdater,
+                mGluonNewIncomingChangesUpdater);
+        }
+
+        void ExecuteFullReload()
+        {
+            mException = null;
+
+            DisposeNewIncomingChanges(this);
+
+            InitializePlastic();
+        }
+
+        void DoExceptionErrorArea()
+        {
+            string labelText = PlasticLocalization.GetString(
+                PlasticLocalization.Name.UnexpectedError);
+
+            string buttonText = PlasticLocalization.GetString(
+                PlasticLocalization.Name.ReloadButton);
+
+            DrawActionHelpBox.For(
+                Images.GetErrorDialogIcon(), labelText, buttonText,
+                ExecuteFullReload);
+        }
+
+        WelcomeView GetWelcomeView()
+        {
+            if (mWelcomeView != null)
+                return mWelcomeView;
+
+            mWelcomeView = new WelcomeView(
+                this,
+                this,
+                mPlasticAPI,
+                mPlasticWebRestApi);
+
+            return mWelcomeView;
+        }
+
+        static void DoHeader(
+            WorkspaceInfo workspaceInfo,
+            PlasticGUIClient plasticClient,
+            IMergeViewLauncher mergeViewLauncher,
+            IGluonViewSwitcher gluonSwitcher,
+            bool isGluonMode,
+            IIncomingChangesNotificationPanel incomingChangesNotificationPanel)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            GUILayout.Label(
+                plasticClient.HeaderTitle,
+                UnityStyles.PlasticWindow.HeaderTitleLabel);
+
+            GUILayout.FlexibleSpace();
+
+            DrawIncomingChangesNotificationPanel.ForMode(
+                workspaceInfo, plasticClient,
+                mergeViewLauncher, gluonSwitcher, isGluonMode,
+                incomingChangesNotificationPanel.IsVisible,
+                incomingChangesNotificationPanel.Data);
+
+            //TODO: Codice - beta: hide the switcher until the update dialog is implemented
+            //DrawGuiModeSwitcher.ForMode(
+            //    isGluonMode, plasticClient, changesTreeView, editorWindow);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoTabToolbar(
+            WorkspaceInfo workspaceInfo,
+            PlasticGUIClient plasticClient,
+            ViewSwitcher viewSwitcher,
+            bool isGluonMode)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            viewSwitcher.TabButtonsGUI();
+
+            GUILayout.FlexibleSpace();
+
+            DoLaunchButtons(workspaceInfo, isGluonMode);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoLaunchButtons(
+            WorkspaceInfo wkInfo,
+            bool isGluonMode)
+        {
+            //TODO: Codice - beta: hide the diff button until the behavior is implemented
+            /*GUILayout.Button(PlasticLocalization.GetString(
+                PlasticLocalization.Name.DiffWindowMenuItemDiff),
+                EditorStyles.toolbarButton,
+                GUILayout.Width(UnityConstants.REGULAR_BUTTON_WIDTH));*/
+
+            if (isGluonMode)
+            {
+                var label = PlasticLocalization.GetString(PlasticLocalization.Name.ConfigureGluon);
+                if (DrawActionButton.For(label))
+                    LaunchTool.OpenWorkspaceConfiguration(wkInfo);
+            }
+            else
+            {
+                var label = PlasticLocalization.GetString(PlasticLocalization.Name.LaunchBranchExplorer);
+                if (DrawActionButton.For(label))
+                    LaunchTool.OpenBranchExplorer(wkInfo);
+            }
+
+            string openToolText = isGluonMode ?
+                PlasticLocalization.GetString(PlasticLocalization.Name.LaunchGluonButton) :
+                PlasticLocalization.GetString(PlasticLocalization.Name.LaunchPlasticButton);
+
+            if (DrawActionButton.For(openToolText))
+                LaunchTool.OpenGUIForMode(wkInfo, isGluonMode);
+        }
+
+        static void SetupCloudProjectIdIfNeeded(
+            WorkspaceInfo wkInfo,
+            IPlasticAPI plasticApi)
+        {
+            if (SetupCloudProjectId.HasCloudProjectId())
+                return;
+
+            SetupCloudProjectId.ForWorkspace(wkInfo, plasticApi);
+
+            mLog.DebugFormat("Setup CloudProjectId on Project: {0}",
+                wkInfo.ClientPath);
+        }
+
+        static void DisableVCSIfEnabled(string projectPath)
+        {
+            if (!VCSPlugin.IsEnabled())
+                return;
+
+            VCSPlugin.Disable();
+
+            mLog.DebugFormat("Disabled VCS Plugin on Project: {0}",
+                projectPath);
+        }
+
+        static void DisposeNewIncomingChanges(PlasticWindow window)
+        {
+            NewIncomingChanges.DisposeUpdater(
+                window.mDeveloperNewIncomingChangesUpdater,
+                window.mGluonNewIncomingChangesUpdater);
+
+            window.mDeveloperNewIncomingChangesUpdater = null;
+            window.mGluonNewIncomingChangesUpdater = null;
+        }
+
+        static void RegisterApplicationFocusHandlers(PlasticWindow window)
+        {
+            EditorWindowFocus.OnApplicationActivated += window.OnApplicationActivated;
+            EditorWindowFocus.OnApplicationDeactivated += window.OnApplicationDeactivated;
+        }
+
+        static void UnRegisterApplicationFocusHandlers(PlasticWindow window)
+        {
+            EditorWindowFocus.OnApplicationActivated -= window.OnApplicationActivated;
+            EditorWindowFocus.OnApplicationDeactivated -= window.OnApplicationDeactivated;
+        }
+
+        static bool IsExitGUIException(Exception ex)
+        {
+            return ex is ExitGUIException;
+        }
+
+        static bool IsIMGUIPaintException(Exception ex)
+        {
+            if (!(ex is ArgumentException))
+                return false;
+
+            return ex.Message.StartsWith("Getting control") &&
+                   ex.Message.Contains("controls when doing repaint");
+        }
+
+        static void ClosePlasticWindow(PlasticWindow window)
+        {
+            UnRegisterApplicationFocusHandlers(window);
+
+            PlasticApp.Dispose();
+
+            AssetMenuItems.Disable();
+
+            DrawInspectorOperations.Disable();
+
+            DrawAssetOverlay.Dispose();
+
+            if (window.mEventSenderScheduler != null)
+            {
+                window.mPingEventLoop.Stop();
+                window.mEventSenderScheduler.End();
+            }
+
+            DisposeNewIncomingChanges(window);
+
+            AvatarImages.Dispose();
+        }
+
+        static void ShowPlasticWindow(PlasticWindow window)
+        {
+            EditorWindow dockWindow = FindEditorWindow.ToDock<PlasticWindow>();
+
+            PlasticWindow newPlasticWindow = InstantiateFrom(window);
+
+            if (DockEditorWindow.IsAvailable())
+                DockEditorWindow.To(dockWindow, newPlasticWindow);
+
+            newPlasticWindow.Show();
+
+            newPlasticWindow.Focus();
+        }
+
+        static bool NeedsToDisplayWelcomeView(
+            bool isPlasticExeAvailable,
+            bool clientNeedsConfiguration,
+            WorkspaceInfo wkInfo)
+        {
+            if (!isPlasticExeAvailable)
+                return true;
+
+            if (clientNeedsConfiguration)
+                return true;
+
+            if (wkInfo == null)
+                return true;
+
+            return false;
+        }
+
+        static void RepaintProjectWindow()
+        {
+            EditorWindow projectWindow = FindEditorWindow.ProjectWindow();
+
+            if (projectWindow == null)
+                return;
+
+            projectWindow.Repaint();
+        }
+
+        static void DisableCollabIfEnabled(string projectPath)
+        {
+            if (!CollabPlugin.IsEnabled())
+                return;
+
+            CollabPlugin.Disable();
+
+            mLog.DebugFormat("Disabled Collab Plugin on Project: {0}",
+                projectPath);
+        }
+
+        static PlasticWindow InstantiateFrom(PlasticWindow window)
+        {
+            PlasticWindow result = Instantiate(window);
+            result.mWkInfo = window.mWkInfo;
+            result.mPlasticClient = window.mPlasticClient;
+            result.mViewSwitcher = window.mViewSwitcher;
+            result.mCooldownAutoRefreshPendingChangesAction = window.mCooldownAutoRefreshPendingChangesAction;
+            result.mDeveloperNewIncomingChangesUpdater = window.mDeveloperNewIncomingChangesUpdater;
+            result.mGluonNewIncomingChangesUpdater = window.mGluonNewIncomingChangesUpdater;
+            result.mException = window.mException;
+            result.mLastUpdateTime = window.mLastUpdateTime;
+            result.mIsGluonMode = window.mIsGluonMode;
+            result.mIncomingChangesNotificationPanel = window.mIncomingChangesNotificationPanel;
+            result.mWelcomeView = window.mWelcomeView;
+            result.mPlasticAPI = window.mPlasticAPI;
+            result.mEventSenderScheduler = window.mEventSenderScheduler;
+            result.mPingEventLoop = window.mPingEventLoop;
+            return result;
+        }
+
+        static class Reload
+        {
+            internal static void IfWorkspaceConfigChanged(
+                IPlasticAPI plasticApi,
+                WorkspaceInfo lastWkInfo,
+                bool lastIsGluonMode,
+                Action reloadAction)
+            {
+                string applicationPath = Application.dataPath;
+
+                bool isGluonMode = false;
+                WorkspaceInfo wkInfo = null;
+
+                IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+                waiter.Execute(
+                    /*threadOperationDelegate*/ delegate
+                    {
+                        wkInfo = FindWorkspace.
+                            InfoForApplicationPath(applicationPath, plasticApi);
+
+                        if (wkInfo != null)
+                            isGluonMode = plasticApi.IsGluonWorkspace(wkInfo);
+                    },
+                    /*afterOperationDelegate*/ delegate
+                    {
+                        if (waiter.Exception != null)
+                            return;
+
+                        if (!IsWorkspaceConfigChanged(
+                                lastWkInfo, wkInfo,
+                                lastIsGluonMode, isGluonMode))
+                            return;
+
+                        reloadAction();
+                });
+            }
+
+            static bool IsWorkspaceConfigChanged(
+                WorkspaceInfo lastWkInfo,
+                WorkspaceInfo currentWkInfo,
+                bool lastIsGluonMode,
+                bool currentIsGluonMode)
+            {
+                if (lastIsGluonMode != currentIsGluonMode)
+                    return true;
+
+                if (lastWkInfo == null || currentWkInfo == null)
+                    return true;
+
+                return !lastWkInfo.Equals(currentWkInfo);
+            }
+        }
+
+        [SerializeField]
+        bool mForceToOpen;
+
+        [NonSerialized]
+        WorkspaceInfo mWkInfo;
+
+        Exception mException;
+
+        IIncomingChangesNotificationPanel mIncomingChangesNotificationPanel;
+
+        double mLastUpdateTime = 0f;
+
+        CooldownWindowDelayer mCooldownAutoRefreshPendingChangesAction;
+        ViewSwitcher mViewSwitcher;
+        WelcomeView mWelcomeView;
+
+        PlasticGui.WorkspaceWindow.NewIncomingChangesUpdater mDeveloperNewIncomingChangesUpdater;
+        GluonNewIncomingChangesUpdater mGluonNewIncomingChangesUpdater;
+
+        PlasticGUIClient mPlasticClient;
+
+        bool mIsGluonMode;
+        bool mDisableCollabIfEnabledWhenLoaded;
+
+        PlasticAPI mPlasticAPI;
+        static PlasticWebRestApi mPlasticWebRestApi;
+        EventSenderScheduler mEventSenderScheduler;
+        PingEventLoop mPingEventLoop;
+
+        static readonly ILog mLog = LogManager.GetLogger("PlasticWindow");
+    }
+}
+ 
\ No newline at end of file
diff --git a/Editor/PlasticSCM/PlasticWindow.cs.meta b/Editor/PlasticSCM/PlasticWindow.cs.meta
new file mode 100644
index 0000000..7417330
--- /dev/null
+++ b/Editor/PlasticSCM/PlasticWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6629f1bb292b749a18b5fff7994c8b19
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/SetupCloudProjectId.cs b/Editor/PlasticSCM/SetupCloudProjectId.cs
new file mode 100644
index 0000000..89c4df3
--- /dev/null
+++ b/Editor/PlasticSCM/SetupCloudProjectId.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Reflection;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using Codice.LogWrapper;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor
+{
+    static class SetupCloudProjectId
+    {
+        internal static bool HasCloudProjectId()
+        {
+            //disable Warning CS0618  'PlayerSettings.cloudProjectId' is obsolete: 'cloudProjectId is deprecated
+#pragma warning disable 0618
+            return !string.IsNullOrEmpty(PlayerSettings.cloudProjectId);
+        }
+
+        internal static void ForWorkspace(
+            WorkspaceInfo wkInfo,
+            IPlasticAPI plasticApi)
+        {
+            RepositoryInfo repInfo = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    RepositorySpec repSpec = plasticApi.GetRepositorySpec(wkInfo);
+
+                    repInfo = plasticApi.GetRepositoryInfo(repSpec);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.LogException(
+                            "SetupCloudProjectId",
+                            waiter.Exception);
+                        return;
+                    }
+
+                    SetupCloudProjectId.ForRepository(repInfo);
+                });
+        }
+
+        internal static void ForRepository(RepositoryInfo repInfo)
+        {
+            string projectId = repInfo.GUID.ToString();
+
+            // Invokes PlayerSettings.SetCloudProjectId(projectId)
+            SetCloudProjectId(projectId);
+
+            AssetDatabase.SaveAssets();
+        }
+
+        static void SetCloudProjectId(string projectId)
+        {
+            MethodInfo InternalSetCloudProjectId = PlayerSettingsType.GetMethod(
+                "SetCloudProjectId",
+                BindingFlags.NonPublic | BindingFlags.Static);
+
+            if (InternalSetCloudProjectId == null)
+            {
+                Debug.LogWarning(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CannotWriteCloudProjectId));
+                return;
+            }
+
+            InternalSetCloudProjectId.Invoke(
+                null, new object[] { projectId });
+        }
+
+        static readonly Type PlayerSettingsType =
+            typeof(UnityEditor.PlayerSettings);
+
+        static readonly ILog mLog = LogManager.GetLogger("SetupCloudProjectId");
+    }
+}
diff --git a/Editor/PlasticSCM/SetupCloudProjectId.cs.meta b/Editor/PlasticSCM/SetupCloudProjectId.cs.meta
new file mode 100644
index 0000000..25ceb41
--- /dev/null
+++ b/Editor/PlasticSCM/SetupCloudProjectId.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5326c7fb2eb17ce419ae9e925c9f26fd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/SwitchModeConfirmationDialog.cs b/Editor/PlasticSCM/SwitchModeConfirmationDialog.cs
new file mode 100644
index 0000000..c43b62a
--- /dev/null
+++ b/Editor/PlasticSCM/SwitchModeConfirmationDialog.cs
@@ -0,0 +1,116 @@
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal class SwitchModeConfirmationDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 560, 180);
+            }
+        }
+
+        internal static bool SwitchMode(
+            bool isGluonMode,
+            EditorWindow parentWindow)
+        {
+            SwitchModeConfirmationDialog dialog = Create(isGluonMode);
+            return dialog.RunModal(parentWindow) == ResponseType.Ok;
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(
+                PlasticLocalization.Name.SwitchModeConfirmationDialogTitle));
+
+            DoExplanationArea(mIsGluonMode);
+
+            GUILayout.Space(20);
+
+            DoButtonsArea();
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.SwitchModeConfirmationDialogTitle);
+        }
+
+        void DoExplanationArea(bool isGluonMode)
+        {
+            PlasticLocalization.Name currentMode = isGluonMode ?
+                PlasticLocalization.Name.GluonMode :
+                PlasticLocalization.Name.DeveloperMode;
+
+            PlasticLocalization.Name selectedMode = isGluonMode ?
+                PlasticLocalization.Name.DeveloperMode :
+                PlasticLocalization.Name.GluonMode;
+
+            string formattedExplanation = PlasticLocalization.GetString(
+                PlasticLocalization.Name.SwitchModeConfirmationDialogExplanation,
+                PlasticLocalization.GetString(currentMode),
+                PlasticLocalization.GetString(selectedMode),
+                "{0}");
+
+            TextBlockWithEndLink(
+                GLUON_HELP_URL, formattedExplanation, UnityStyles.Paragraph);
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoSwitchButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoSwitchButton();
+            }
+        }
+
+        void DoSwitchButton()
+        {
+            if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.SwitchButton)))
+                return;
+
+            OkButtonAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        static SwitchModeConfirmationDialog Create(
+            bool isGluonMode)
+        {
+            var instance = CreateInstance<SwitchModeConfirmationDialog>();
+            instance.mIsGluonMode = isGluonMode;
+            instance.mEnterKeyAction = instance.OkButtonAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            return instance;
+        }
+
+        bool mIsGluonMode;
+
+        const string GLUON_HELP_URL = "https://www.plasticscm.com/gluon";
+    }
+}
diff --git a/Editor/PlasticSCM/SwitchModeConfirmationDialog.cs.meta b/Editor/PlasticSCM/SwitchModeConfirmationDialog.cs.meta
new file mode 100644
index 0000000..89f04fe
--- /dev/null
+++ b/Editor/PlasticSCM/SwitchModeConfirmationDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cf7c1a153f50c6548bfff5dfd2ef5dff
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Tool.meta b/Editor/PlasticSCM/Tool.meta
new file mode 100644
index 0000000..5ea72ab
--- /dev/null
+++ b/Editor/PlasticSCM/Tool.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e8c918ed7b49ea54ca28f8c04b27140a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Tool/BringWindowToFront.cs b/Editor/PlasticSCM/Tool/BringWindowToFront.cs
new file mode 100644
index 0000000..8da0124
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/BringWindowToFront.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Unity.PlasticSCM.Editor.Tool
+{
+    internal static class BringWindowToFront
+    {
+        internal static void ForWindowsProcess(int processId)
+        {
+            IntPtr handle = FindMainWindowForProcess(processId);
+
+            if (IsIconic(handle))
+                ShowWindow(handle, SW_RESTORE);
+
+            SetForegroundWindow(handle);
+        }
+
+        static IntPtr FindMainWindowForProcess(int processId)
+        {
+            IntPtr result = IntPtr.Zero;
+
+            EnumWindows(delegate (IntPtr wnd, IntPtr param)
+            {
+                uint windowProcessId = 0;
+                GetWindowThreadProcessId(wnd, out windowProcessId);
+
+                if (windowProcessId == processId &&
+                    IsMainWindow(wnd))
+                {
+                    result = wnd;
+                    return false;
+                }
+
+                return true;
+            }, IntPtr.Zero);
+
+            return result;
+        }
+
+        static bool IsMainWindow(IntPtr handle)
+        {
+            return GetWindow(new HandleRef(null, handle), GW_OWNER) == IntPtr.Zero
+                && IsWindowVisible(new HandleRef(null, handle));
+        }
+
+        // Delegate to filter which windows to include
+        delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+        [DllImport("user32.dll")]
+        static extern bool EnumWindows(EnumWindowsProc enumProc, IntPtr lParam);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        static extern IntPtr GetWindow(HandleRef hWnd, int uCmd);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        static extern bool IsWindowVisible(HandleRef hWnd);
+
+        [DllImport("user32.dll")]
+        static extern bool ShowWindow(IntPtr handle, int nCmdShow);
+
+        [DllImport("user32.dll")]
+        static extern bool SetForegroundWindow(IntPtr handle);
+
+        [DllImport("user32.dll")]
+        static extern bool IsIconic(IntPtr handle);
+
+        const int GW_OWNER = 4;
+        const int SW_RESTORE = 9;
+    }
+}
diff --git a/Editor/PlasticSCM/Tool/BringWindowToFront.cs.meta b/Editor/PlasticSCM/Tool/BringWindowToFront.cs.meta
new file mode 100644
index 0000000..39b1a1f
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/BringWindowToFront.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bc5c1fa3d4519114cb21f3fedfe6039d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Tool/FindTool.cs b/Editor/PlasticSCM/Tool/FindTool.cs
new file mode 100644
index 0000000..111af0a
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/FindTool.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Unity.PlasticSCM.Editor.Tool
+{
+    internal static class FindTool
+    {
+        internal static string ObtainToolCommand(
+            string toolName, List<string> installationPaths)
+        {
+            List<string> processPaths = GetPathsFromEnvVariable(
+                PATH_ENVIRONMENT_VARIABLE,
+                EnvironmentVariableTarget.Process);
+
+            List<string> machinePaths = GetPathsFromEnvVariable(
+                PATH_ENVIRONMENT_VARIABLE,
+                EnvironmentVariableTarget.Machine);
+
+            List<string> pathsToLookup = new List<string>();
+            pathsToLookup.AddRange(processPaths);
+            pathsToLookup.AddRange(machinePaths);
+            pathsToLookup.AddRange(installationPaths);
+
+            string toolPath = FindToolInPaths(toolName, pathsToLookup);
+
+            if (string.IsNullOrEmpty(toolPath))
+                return null;
+
+            EnsureIsInProcessPathEnvVariable(toolPath, processPaths);
+
+            return toolPath;
+        }
+
+        static string FindToolInPaths(
+            string toolName,
+            List<string> paths)
+        {
+            foreach (string path in paths)
+            {
+                if (path == null)
+                    continue;
+
+                if (path.Trim() == string.Empty)
+                    continue;
+
+                string filePath = CleanFolderPath(path);
+
+                filePath = Path.Combine(filePath, toolName);
+
+                if (File.Exists(filePath))
+                    return Path.GetFullPath(filePath);
+            }
+
+            return null;
+        }
+
+        static string CleanFolderPath(string folderPath)
+        {
+            foreach (char c in Path.GetInvalidPathChars())
+                folderPath = folderPath.Replace(c.ToString(), string.Empty);
+
+            return folderPath;
+        }
+
+        static List<string> GetPathsFromEnvVariable(
+            string variableName,
+            EnvironmentVariableTarget target)
+        {
+            string value = Environment.GetEnvironmentVariable(variableName, target);
+            return new List<string>(value.Split(Path.PathSeparator));
+        }
+
+        static void EnsureIsInProcessPathEnvVariable(
+            string toolPath,
+            List<string> processPaths)
+        {
+            string plasticInstallDir = Path.GetDirectoryName(toolPath);
+
+            if (processPaths.Contains(plasticInstallDir, StringComparer.OrdinalIgnoreCase))
+                return;
+
+            Environment.SetEnvironmentVariable(
+                PATH_ENVIRONMENT_VARIABLE,
+                string.Concat(plasticInstallDir, Path.PathSeparator, processPaths),
+                EnvironmentVariableTarget.Process);
+        }
+
+        const string PATH_ENVIRONMENT_VARIABLE = "PATH";
+    }
+}
diff --git a/Editor/PlasticSCM/Tool/FindTool.cs.meta b/Editor/PlasticSCM/Tool/FindTool.cs.meta
new file mode 100644
index 0000000..313d984
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/FindTool.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2e0d1d689c88f76448cad390443d7ba3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Tool/IsExeAvailable.cs b/Editor/PlasticSCM/Tool/IsExeAvailable.cs
new file mode 100644
index 0000000..1058efb
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/IsExeAvailable.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using Codice.Utils;
+
+namespace Unity.PlasticSCM.Editor.Tool
+{
+    internal static class IsExeAvailable
+    {
+        internal static bool ForMode(bool isGluonMode)
+        {
+            string toolPath = isGluonMode ?
+                PlasticInstallPath.GetGluonExePath() :
+                PlasticInstallPath.GetPlasticExePath();
+
+            return !string.IsNullOrEmpty(toolPath);
+        }
+    }
+
+    internal static class PlasticInstallPath
+    {
+        internal static string GetClientBinDir()
+        {
+            if (PlatformIdentifier.IsWindows())
+            {
+                string plasticExePath = GetPlasticExePath();
+
+                if (plasticExePath == null)
+                    return null;
+
+                return Path.GetDirectoryName(plasticExePath);
+            }
+
+            if (PlatformIdentifier.IsMac())
+                return GetExistingDir(ToolConstants.MACOS_BINDIR);
+
+            return null;
+        }
+
+        internal static string GetPlasticExePath()
+        {
+            if (PlatformIdentifier.IsWindows())
+                return FindTool.ObtainToolCommand(
+                Plastic.GUI_WINDOWS,
+                    new List<String>() { GetWindowsInstallationFolder() });
+
+            if (PlatformIdentifier.IsMac())
+                return GetToolCommand(Plastic.GUI_MACOS);
+
+                return null;
+        }
+
+        internal static string GetGluonExePath()
+        {
+            if (PlatformIdentifier.IsWindows())
+                return FindTool.ObtainToolCommand(
+                    Gluon.GUI_WINDOWS,
+                    new List<String>() { GetWindowsInstallationFolder() });
+
+            if (PlatformIdentifier.IsMac())
+                return GetToolCommand(Gluon.GUI_MACOS);
+
+            return null;
+        }
+
+        static string GetToolCommand(string tool)
+        {
+            return File.Exists(tool) ? tool : null;
+        }
+
+        static string GetExistingDir(string directory)
+        {
+            return Directory.Exists(directory) ? directory : null;
+        }
+
+        static string GetWindowsInstallationFolder()
+        {
+            string programFilesFolder = Environment.GetFolderPath(
+                Environment.SpecialFolder.ProgramFiles);
+
+            return Path.Combine(Path.Combine(programFilesFolder,
+                PLASTICSCM_FOLDER), PLASTICSCM_SUBFOLDER);
+        }
+
+        const string PLASTICSCM_FOLDER = "PlasticSCM5";
+        const string PLASTICSCM_SUBFOLDER = "client";
+
+        class Plastic
+        {
+            internal const string GUI_WINDOWS = "plastic.exe";
+            internal const string GUI_MACOS = "/Applications/PlasticSCM.app/Contents/MacOS/PlasticSCM";
+        }
+
+        class Gluon
+        {
+            internal const string GUI_WINDOWS = "gluon.exe";
+            internal const string GUI_MACOS = "/Applications/Gluon.app/Contents/MacOS/Gluon";
+        }
+            }
+            }
+
diff --git a/Editor/PlasticSCM/Tool/IsExeAvailable.cs.meta b/Editor/PlasticSCM/Tool/IsExeAvailable.cs.meta
new file mode 100644
index 0000000..60ffdaf
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/IsExeAvailable.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f25df29da91c45449ada5f3da8cf20ea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Tool/LaunchInstaller.cs b/Editor/PlasticSCM/Tool/LaunchInstaller.cs
new file mode 100644
index 0000000..eb47195
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/LaunchInstaller.cs
@@ -0,0 +1,23 @@
+using System.Diagnostics;
+
+using Codice.Utils;
+
+namespace Unity.PlasticSCM.Editor.Tool
+{
+    internal static class LaunchInstaller
+    {
+        internal static Process ForPlatform(string installerPath)
+        {
+            if (PlatformIdentifier.IsMac())
+            {
+                return Process.Start(
+                    ToolConstants.Installer.INSTALLER_MACOS_OPEN,
+                    string.Format(ToolConstants.Installer.INSTALLER_MACOS_OPEN_ARGS, installerPath));
+            }
+
+            return Process.Start(
+                installerPath,
+                ToolConstants.Installer.INSTALLER_WINDOWS_ARGS);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Tool/LaunchInstaller.cs.meta b/Editor/PlasticSCM/Tool/LaunchInstaller.cs.meta
new file mode 100644
index 0000000..338bd26
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/LaunchInstaller.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7b405b01c6be83742bc000fb416b4dbf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Tool/LaunchTool.cs b/Editor/PlasticSCM/Tool/LaunchTool.cs
new file mode 100644
index 0000000..a67dbe4
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/LaunchTool.cs
@@ -0,0 +1,359 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+
+using Codice.Client.BaseCommands.EventTracking;
+using Codice.CM.Common;
+using Codice.LogWrapper;
+using Codice.Utils;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.Tool
+{
+    internal static class LaunchTool
+    {
+        internal static Process OpenConfigurationForMode(bool isGluonMode)
+        {
+            mLog.Debug("Opening Configuration'.");
+
+            if (isGluonMode)
+            {
+                Process gluonProcess = ExecuteProcess(
+                    PlasticInstallPath.GetGluonExePath(),
+                    ToolConstants.Gluon.GUI_CONFIGURE_ARG);
+
+                if (gluonProcess != null)
+                    mGluonProcessId = gluonProcess.Id;
+
+                return gluonProcess;
+            }
+
+            Process plasticProcess = ExecuteProcess(
+                PlasticInstallPath.GetPlasticExePath(),
+                ToolConstants.Plastic.GUI_CONFIGURE_ARG);
+
+            if (plasticProcess != null)
+                mPlasticProcessId = plasticProcess.Id;
+
+            return plasticProcess;
+        }
+
+        internal static void OpenGUIForMode(WorkspaceInfo wkInfo, bool isGluonMode)
+        {
+            mLog.DebugFormat(
+                "Opening GUI on wkPath '{0}'.",
+                wkInfo.ClientPath);
+
+            TrackFeatureUseEvent.For(
+                Plastic.API.GetRepositorySpec(wkInfo),
+                isGluonMode ?
+                    TrackFeatureUseEvent.Features.LaunchGluonTool :
+                    TrackFeatureUseEvent.Features.LaunchPlasticTool);
+
+            if (isGluonMode)
+            {
+                Process gluonProcess = ExecuteGUI(
+                    PlasticInstallPath.GetGluonExePath(),
+                    string.Format(
+                        ToolConstants.Gluon.GUI_WK_EXPLORER_ARG,
+                        wkInfo.ClientPath),
+                    ToolConstants.Gluon.GUI_COMMAND_FILE_ARG,
+                    ToolConstants.Gluon.GUI_COMMAND_FILE,
+                    mGluonProcessId);
+
+                if (gluonProcess != null)
+                    mGluonProcessId = gluonProcess.Id;
+
+                return;
+            }
+
+            if (PlatformIdentifier.IsMac())
+            {
+                Process plasticProcess = ExecuteGUI(
+                    PlasticInstallPath.GetPlasticExePath(),
+                    string.Format(
+                        ToolConstants.Plastic.GUI_MACOS_WK_EXPLORER_ARG,
+                        wkInfo.ClientPath),
+                    ToolConstants.Plastic.GUI_MACOS_COMMAND_FILE_ARG,
+                    ToolConstants.Plastic.GUI_MACOS_COMMAND_FILE,
+                    mPlasticProcessId);
+
+                if (plasticProcess != null)
+                    mPlasticProcessId = plasticProcess.Id;
+
+                return;
+            }
+
+            ExecuteProcess(
+                PlasticInstallPath.GetPlasticExePath(),
+                string.Format(
+                    ToolConstants.Plastic.GUI_WINDOWS_WK_ARG,
+                    wkInfo.ClientPath));
+        }
+
+        internal static void OpenBranchExplorer(WorkspaceInfo wkInfo)
+        {
+            mLog.DebugFormat(
+                "Opening Branch Explorer on wkPath '{0}'.",
+                wkInfo.ClientPath);
+
+            TrackFeatureUseEvent.For(
+                Plastic.API.GetRepositorySpec(wkInfo),
+                TrackFeatureUseEvent.Features.LaunchBranchExplorer);
+
+            if (PlatformIdentifier.IsMac())
+            {
+                Process plasticProcess = ExecuteGUI(
+                    PlasticInstallPath.GetPlasticExePath(),
+                    string.Format(
+                        ToolConstants.Plastic.GUI_MACOS_BREX_ARG,
+                        wkInfo.ClientPath),
+                    ToolConstants.Plastic.GUI_MACOS_COMMAND_FILE_ARG,
+                    ToolConstants.Plastic.GUI_MACOS_COMMAND_FILE,
+                    mPlasticProcessId);
+
+                if (plasticProcess != null)
+                    mPlasticProcessId = plasticProcess.Id;
+
+                return;
+            }
+
+            Process brexProcess = ExecuteWindowsGUI(
+                PlasticInstallPath.GetPlasticExePath(),
+                string.Format(
+                    ToolConstants.Plastic.GUI_WINDOWS_BREX_ARG,
+                    wkInfo.ClientPath),
+                mBrexProcessId);
+
+            if (brexProcess != null)
+                mBrexProcessId = brexProcess.Id;
+        }
+
+        internal static void OpenChangesetDiffs(string fullChangesetSpec, bool isGluonMode)
+        {
+            mLog.DebugFormat(
+                "Launching changeset diffs for '{0}'",
+                fullChangesetSpec);
+
+            string exePath = (isGluonMode) ?
+                PlasticInstallPath.GetGluonExePath() :
+                PlasticInstallPath.GetPlasticExePath();
+
+            string changesetDiffArg = (isGluonMode) ?
+                ToolConstants.Gluon.GUI_CHANGESET_DIFF_ARG :
+                ToolConstants.Plastic.GUI_CHANGESET_DIFF_ARG;
+
+            ExecuteProcess(exePath,
+                string.Format(
+                    changesetDiffArg, fullChangesetSpec));
+        }
+
+        internal static void OpenSelectedChangesetsDiffs(
+            string srcFullChangesetSpec,
+            string dstFullChangesetSpec,
+            bool isGluonMode)
+        {
+            mLog.DebugFormat(
+                "Launching selected changesets diffs for '{0}' and '{1}'",
+                srcFullChangesetSpec,
+                dstFullChangesetSpec);
+
+            string exePath = (isGluonMode) ?
+                PlasticInstallPath.GetGluonExePath() :
+                PlasticInstallPath.GetPlasticExePath();
+
+            string selectedChangesetsDiffArgs = (isGluonMode) ?
+                ToolConstants.Gluon.GUI_SELECTED_CHANGESETS_DIFF_ARGS :
+                ToolConstants.Plastic.GUI_SELECTED_CHANGESETS_DIFF_ARGS;
+
+            ExecuteProcess(exePath,
+                string.Format(
+                    selectedChangesetsDiffArgs,
+                    srcFullChangesetSpec,
+                    dstFullChangesetSpec));
+        }
+
+        internal static void OpenBranchDiffs(string fullBranchSpec, bool isGluonMode)
+        {
+            mLog.DebugFormat(
+                "Launching branch diffs for '{0}'",
+                fullBranchSpec);
+
+            string exePath = (isGluonMode) ?
+                PlasticInstallPath.GetGluonExePath() :
+                PlasticInstallPath.GetPlasticExePath();
+
+            string branchDiffArg = (isGluonMode) ?
+                ToolConstants.Gluon.GUI_BRANCH_DIFF_ARG :
+                ToolConstants.Plastic.GUI_BRANCH_DIFF_ARG;
+
+            ExecuteProcess(exePath,
+                string.Format(
+                    branchDiffArg, fullBranchSpec));
+        }
+
+        internal static void OpenWorkspaceConfiguration(WorkspaceInfo wkInfo)
+        {
+            mLog.DebugFormat(
+                "Opening Workspace Configuration on wkPath '{0}'.",
+                wkInfo.ClientPath);
+
+            TrackFeatureUseEvent.For(
+                Plastic.API.GetRepositorySpec(wkInfo),
+                TrackFeatureUseEvent.Features.LaunchPartialConfigure);
+
+            Process gluonProcess = ExecuteGUI(
+                PlasticInstallPath.GetGluonExePath(),
+                string.Format(
+                    ToolConstants.Gluon.GUI_WK_CONFIGURATION_ARG,
+                    wkInfo.ClientPath),
+                ToolConstants.Gluon.GUI_COMMAND_FILE_ARG,
+                ToolConstants.Gluon.GUI_COMMAND_FILE,
+                mGluonProcessId);
+
+            if (gluonProcess == null)
+                return;
+
+            mGluonProcessId = gluonProcess.Id;
+        }
+
+        internal static void OpenMerge(string wkPath)
+        {
+            mLog.DebugFormat(
+                "Opening Merge on wkPath '{0}'.",
+                wkPath);
+
+            if (PlatformIdentifier.IsMac())
+            {
+                Process plasticProcess = ExecuteGUI(
+                    PlasticInstallPath.GetPlasticExePath(),
+                    string.Format(ToolConstants.Plastic.GUI_MACOS_MERGE_ARG, wkPath),
+                    ToolConstants.Plastic.GUI_MACOS_COMMAND_FILE_ARG,
+                    ToolConstants.Plastic.GUI_MACOS_COMMAND_FILE,
+                    mPlasticProcessId);
+
+                if (plasticProcess != null)
+                    mPlasticProcessId = plasticProcess.Id;
+
+                return;
+            }
+
+            ExecuteProcess(
+                PlasticInstallPath.GetPlasticExePath(),
+                string.Format(ToolConstants.Plastic.GUI_WINDOWS_MERGE_ARG, wkPath));
+        }
+
+        static Process ExecuteGUI(
+            string program,
+            string args,
+            string commandFileArg,
+            string commandFileName,
+            int processId)
+        {
+            string commandFile = Path.Combine(
+                Path.GetTempPath(), commandFileName);
+
+            Process process = GetGUIProcess(program, processId);
+
+            if (process == null)
+            {
+                mLog.DebugFormat("Executing {0} (new process).", program);
+
+                return ExecuteProcess(
+                    program, args + string.Format(commandFileArg, commandFile));
+            }
+
+            mLog.DebugFormat("Executing {0} (reuse process pid:{1}).", program, processId);
+
+            using (StreamWriter writer = new StreamWriter(new FileStream(
+                commandFile, FileMode.Append, FileAccess.Write, FileShare.Read)))
+            {
+                writer.WriteLine(args);
+            }
+
+            return process;
+        }
+
+        static Process ExecuteWindowsGUI(
+            string program,
+            string args,
+            int processId)
+        {
+            Process process = GetGUIProcess(program, processId);
+
+            if (process == null)
+            {
+                mLog.DebugFormat("Executing {0} (new process).", program);
+
+                return ExecuteProcess(program, args);
+            }
+
+            mLog.DebugFormat("Not executing {0} (existing process pid:{1}).", program, processId);
+
+            BringWindowToFront.ForWindowsProcess(process.Id);
+
+            return process;
+        }
+
+        static Process ExecuteProcess(string program, string args)
+        {
+            mLog.DebugFormat("Execute process: '{0} {1}'", program, args);
+
+            Process process = BuildProcess(program, args);
+
+            try
+            {
+                process.Start();
+
+                return process;
+            }
+            catch (Exception ex)
+            {
+                mLog.ErrorFormat("Couldn't execute the program {0}: {1}",
+                    program, ex.Message);
+                mLog.DebugFormat("Stack trace: {0}",
+                    ex.StackTrace);
+
+                return null;
+            }
+        }
+
+        static Process BuildProcess(string program, string args)
+        {
+            Process result = new Process();
+            result.StartInfo.FileName = program;
+            result.StartInfo.Arguments = args;
+            result.StartInfo.CreateNoWindow = false;
+            return result;
+        }
+
+        static Process GetGUIProcess(string program, int processId)
+        {
+            if (processId == -1)
+                return null;
+
+            mLog.DebugFormat("Checking {0} process [pid:{1}].", program, processId);
+
+            try
+            {
+                Process process = Process.GetProcessById(processId);
+
+                if (process == null)
+                    return null;
+
+                return process.HasExited ? null : process;
+            }
+            catch
+            {
+                // process is not running
+                return null;
+            }
+        }
+
+        static int mPlasticProcessId = -1;
+        static int mGluonProcessId = -1;
+        static int mBrexProcessId = -1;
+
+        static readonly ILog mLog = LogManager.GetLogger("LaunchTool");
+    }
+}
diff --git a/Editor/PlasticSCM/Tool/LaunchTool.cs.meta b/Editor/PlasticSCM/Tool/LaunchTool.cs.meta
new file mode 100644
index 0000000..526a8c2
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/LaunchTool.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a6d05b29e607e62478df26227566e1b9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Tool/ToolConstants.cs b/Editor/PlasticSCM/Tool/ToolConstants.cs
new file mode 100644
index 0000000..0b2e337
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/ToolConstants.cs
@@ -0,0 +1,52 @@
+namespace Unity.PlasticSCM.Editor.Tool
+{
+    internal static class ToolConstants
+    {
+        internal static class Plastic
+        {
+
+            internal const string GUI_CONFIGURE_ARG = "--configure";
+
+            internal const string GUI_WINDOWS_WK_ARG = "--wk=\"{0}\"";
+            internal const string GUI_WINDOWS_BREX_ARG = "--branchexplorer=\"{0}\"";
+            internal const string GUI_WINDOWS_MERGE_ARG = "--resolve=\"{0}\"";
+            internal const string GUI_WINDOWS_INCOMING_CHANGES_ARG = "--resolve=\"{0}\" --incomingmerge";
+
+            internal const string GUI_MACOS_WK_EXPLORER_ARG = "--wk=\"{0}\" --view=ItemsView";
+            internal const string GUI_MACOS_BREX_ARG = "--wk=\"{0}\" --view=BranchExplorerView";
+            internal const string GUI_MACOS_MERGE_ARG = "--wk=\"{0}\" --view=MergeView";
+            internal const string GUI_MACOS_INCOMING_CHANGES_ARG = "--wk=\"{0}\" --view=IncomingChangesView";
+            internal const string GUI_MACOS_COMMAND_FILE_ARG = " --command-file=\"{0}\"";
+            internal const string GUI_MACOS_COMMAND_FILE = "macplastic-command-file.txt";
+
+            internal const string GUI_CHANGESET_DIFF_ARG = "--diffchangeset=\"{0}\"";
+            internal const string GUI_SELECTED_CHANGESETS_DIFF_ARGS = "--diffchangesetsrc=\"{0}\" --diffchangesetdst=\"{1}\"";
+            internal const string GUI_BRANCH_DIFF_ARG = "--diffbranch=\"{0}\"";
+        }
+
+        internal static class Gluon
+        {
+
+            internal const string GUI_CONFIGURE_ARG = "--configure";
+
+            internal const string GUI_WK_EXPLORER_ARG = "--wk=\"{0}\" --view=WorkspaceExplorerView";
+            internal const string GUI_WK_CONFIGURATION_ARG = "--wk=\"{0}\" --view=WorkspaceConfigurationView";
+            internal const string GUI_WK_INCOMING_CHANGES_ARG = "--wk=\"{0}\" --view=IncomingChangesView";
+            internal const string GUI_COMMAND_FILE_ARG = " --command-file=\"{0}\"";
+            internal const string GUI_COMMAND_FILE = "gluon-command-file.txt";
+
+            internal const string GUI_CHANGESET_DIFF_ARG = "--diffchangeset=\"{0}\"";
+            internal const string GUI_SELECTED_CHANGESETS_DIFF_ARGS = "--diffchangesetsrc=\"{0}\" --diffchangesetdst=\"{1}\"";
+            internal const string GUI_BRANCH_DIFF_ARG = "--diffbranch=\"{0}\"";
+        }
+
+        internal static class Installer
+        {
+            internal const string INSTALLER_WINDOWS_ARGS = "--mode unattended --unattendedmodeui minimal";
+            internal const string INSTALLER_MACOS_OPEN = "open";
+            internal const string INSTALLER_MACOS_OPEN_ARGS = "-W -n {0}";
+        }
+
+        internal const string MACOS_BINDIR = "/Applications/PlasticSCM.app/Contents/MonoBundle";
+    }
+}
diff --git a/Editor/PlasticSCM/Tool/ToolConstants.cs.meta b/Editor/PlasticSCM/Tool/ToolConstants.cs.meta
new file mode 100644
index 0000000..ef72649
--- /dev/null
+++ b/Editor/PlasticSCM/Tool/ToolConstants.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: de6e8913aefd69d4ca90a7216d225d3a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI.meta b/Editor/PlasticSCM/UI.meta
new file mode 100644
index 0000000..bafbf2f
--- /dev/null
+++ b/Editor/PlasticSCM/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 565f0b089a3d53c4e9a329a5ec1392eb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Avatar.meta b/Editor/PlasticSCM/UI/Avatar.meta
new file mode 100644
index 0000000..c175277
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Avatar.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 43aad6ec3599fb84a89e8fce31748cce
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Avatar/ApplyCircleMask.cs b/Editor/PlasticSCM/UI/Avatar/ApplyCircleMask.cs
new file mode 100644
index 0000000..90050b3
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Avatar/ApplyCircleMask.cs
@@ -0,0 +1,69 @@
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI.Avatar
+{
+    internal static class ApplyCircleMask
+    {
+        internal static Texture2D For(Texture2D sourceImage)
+        {
+            int width = sourceImage.width;
+            int height = sourceImage.height;
+
+            int centerx = sourceImage.width / 2;
+            int centery = sourceImage.height / 2;
+
+            int radius = sourceImage.width / 2;
+
+            Texture2D result = new Texture2D(height, width);
+
+            for (int i = (centerx - radius); i < centerx + radius; i++)
+            {
+                for (int j = (centery - radius); j < centery + radius; j++)
+                {
+                    float dx = i - centerx;
+                    float dy = j - centery;
+
+                    float d = Mathf.Sqrt(dx * dx + dy * dy);
+
+                    float borderSize = 1f;
+
+                    if (d <= (radius - borderSize))
+                    {
+                        result.SetPixel(
+                            i - (centerx - radius),
+                            j - (centery - radius),
+                            sourceImage.GetPixel(i, j));
+                        continue;
+                    }
+
+                    Color color = sourceImage.GetPixel(i, j);
+
+                    result.SetPixel(
+                        i - (centerx - radius),
+                        j - (centery - radius),
+                        Color.Lerp(Color.clear, color,
+                            GetAntialiasAlpha(radius, d, borderSize)));
+                }
+            }
+
+            result.Apply();
+
+            return result;
+        }
+
+        static float GetAntialiasAlpha(float radius, float d, float borderSize)
+        {
+            if (d >= (radius + borderSize))
+                return 0f;
+
+            if (d - radius - borderSize == 0)
+                return 0;
+
+            float proportion =
+                Mathf.Abs(d - radius - borderSize) /
+                (radius + borderSize) - (radius - borderSize);
+
+            return Mathf.Max(0, 1.0f - proportion);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Avatar/ApplyCircleMask.cs.meta b/Editor/PlasticSCM/UI/Avatar/ApplyCircleMask.cs.meta
new file mode 100644
index 0000000..8f169dd
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Avatar/ApplyCircleMask.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e76ce7703143a924b9c0693ee66ebee7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Avatar/AvatarImages.cs b/Editor/PlasticSCM/UI/Avatar/AvatarImages.cs
new file mode 100644
index 0000000..cc384c2
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Avatar/AvatarImages.cs
@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI.Avatar
+{
+    internal static class AvatarImages
+    {
+        internal static void Dispose()
+        {
+            foreach (Texture2D image in mAvatars.Values)
+                UnityEngine.Object.DestroyImmediate(image, true);
+
+            mAvatars.Clear();
+        }
+
+        internal static bool HasGravatar(string email)
+        {
+            return mAvatars.ContainsKey(email);
+        }
+
+        internal static void AddGravatar(string email, Texture2D image)
+        {
+            if (mAvatars.ContainsKey(email))
+                return;
+
+            mAvatars.Add(email, image);
+        }
+
+        internal static void UpdateGravatar(string email, byte[] rawImage)
+        {
+            if (!mAvatars.ContainsKey(email))
+                return;
+
+            Texture2D result = GetTexture(rawImage);
+
+            mAvatars[email] = result;
+        }
+
+        internal static Texture2D GetAvatar(string email)
+        {
+            Texture2D image = GetGravatarImage(email);
+
+            if (image != null)
+                return image;
+
+            return GetDefaultImage();
+        }
+
+        internal static Texture2D GetDefaultImage()
+        {
+            return Images.GetImage(
+                Images.Name.IconEmptyGravatar);
+        }
+
+        static Texture2D GetGravatarImage(string email)
+        {
+            Texture2D avatar;
+            mAvatars.TryGetValue(email, out avatar);
+            return avatar;
+        }
+
+        static Texture2D GetTexture(byte[] rawImage)
+        {
+            Texture2D result = new Texture2D(32, 32);
+
+            result.LoadImage(rawImage);
+
+            Texture2D maskImage = ApplyCircleMask.For(result);
+
+            UnityEngine.Object.DestroyImmediate(result, true);
+
+            return maskImage;
+        }
+
+        static readonly Dictionary<string, Texture2D> mAvatars =
+            new Dictionary<string, Texture2D>();
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Avatar/AvatarImages.cs.meta b/Editor/PlasticSCM/UI/Avatar/AvatarImages.cs.meta
new file mode 100644
index 0000000..ea22536
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Avatar/AvatarImages.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 43c380b3a07cbf449a54619bb50096b1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Avatar/GetAvatar.cs b/Editor/PlasticSCM/UI/Avatar/GetAvatar.cs
new file mode 100644
index 0000000..e8c285c
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Avatar/GetAvatar.cs
@@ -0,0 +1,43 @@
+using System;
+
+using UnityEngine;
+
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.UI.Avatar
+{
+    internal static class GetAvatar
+    {
+        internal static Texture2D ForEmail(
+            string email,
+            Action avatarLoadedAction)
+        {
+            if (string.IsNullOrEmpty(email))
+                return AvatarImages.GetDefaultImage();
+
+            if (AvatarImages.HasGravatar(email))
+                return AvatarImages.GetAvatar(email);
+
+            Texture2D defaultImage =
+                AvatarImages.GetDefaultImage();
+
+            AvatarImages.AddGravatar(email, defaultImage);
+
+            LoadAvatar.ForEmail(
+                email, avatarLoadedAction,
+                AfterDownloadSucceed);
+
+            return defaultImage;
+        }
+
+        static void AfterDownloadSucceed(
+            string email,
+            byte[] avatarBytes,
+            Action avatarLoadedAction)
+        {
+            AvatarImages.UpdateGravatar(email, avatarBytes);
+
+            avatarLoadedAction();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/UI/Avatar/GetAvatar.cs.meta b/Editor/PlasticSCM/UI/Avatar/GetAvatar.cs.meta
new file mode 100644
index 0000000..ebccc5c
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Avatar/GetAvatar.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0afb4c6d979970647841ee14a55b8d25
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/BoolSetting.cs b/Editor/PlasticSCM/UI/BoolSetting.cs
new file mode 100644
index 0000000..f3ac140
--- /dev/null
+++ b/Editor/PlasticSCM/UI/BoolSetting.cs
@@ -0,0 +1,40 @@
+using UnityEditor;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class BoolSetting
+    {
+        internal static bool Load(
+            string boolSettingName,
+            bool defaultValue)
+        {
+            return EditorPrefs.GetBool(
+                GetSettingKey(boolSettingName),
+                defaultValue);
+        }
+
+        internal static void Save(
+            bool value,
+            string boolSettingName)
+        {
+            EditorPrefs.SetBool(
+                GetSettingKey(boolSettingName), value);
+        }
+
+        internal static void Clear(
+            string boolSettingName)
+        {
+            EditorPrefs.DeleteKey(
+                GetSettingKey(boolSettingName));
+        }
+
+        static string GetSettingKey(string boolSettingName)
+        {
+            return string.Format(
+                boolSettingName, PlayerSettings.productGUID,
+                PREFERENCE_VALUE_KEY);
+        }
+
+        static string PREFERENCE_VALUE_KEY = "PreferenceValue";
+    }
+}
diff --git a/Editor/PlasticSCM/UI/BoolSetting.cs.meta b/Editor/PlasticSCM/UI/BoolSetting.cs.meta
new file mode 100644
index 0000000..b9101de
--- /dev/null
+++ b/Editor/PlasticSCM/UI/BoolSetting.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5be77ef41db4cc24a82cd1eca7456b5a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/CooldownWindowDelayer.cs b/Editor/PlasticSCM/UI/CooldownWindowDelayer.cs
new file mode 100644
index 0000000..e94bbff
--- /dev/null
+++ b/Editor/PlasticSCM/UI/CooldownWindowDelayer.cs
@@ -0,0 +1,71 @@
+using System;
+
+using UnityEditor;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class CooldownWindowDelayer
+    {
+        internal CooldownWindowDelayer(Action action, double cooldownSeconds)
+        {
+            mAction = action;
+            mCooldownSeconds = cooldownSeconds;
+        }
+
+        internal void Ping()
+        {
+            if (mIsOnCooldown)
+            {
+                RefreshCooldown();
+                return;
+            }
+
+            StartCooldown();
+        }
+
+        void RefreshCooldown()
+        {
+            mIsOnCooldown = true;
+
+            mSecondsOnCooldown = mCooldownSeconds;
+        }
+
+        void StartCooldown()
+        {
+            mLastUpdateTime = EditorApplication.timeSinceStartup;
+
+            EditorApplication.update += OnUpdate;
+
+            RefreshCooldown();
+        }
+
+        void EndCooldown()
+        {
+            EditorApplication.update -= OnUpdate;
+
+            mIsOnCooldown = false;
+
+            mAction();
+        }
+
+        void OnUpdate()
+        {
+            double updateTime = EditorApplication.timeSinceStartup;
+            double deltaSeconds = updateTime - mLastUpdateTime;
+
+            mSecondsOnCooldown -= deltaSeconds;
+
+            if (mSecondsOnCooldown < 0)
+                EndCooldown();
+
+            mLastUpdateTime = updateTime;
+        }
+
+        readonly Action mAction;
+        readonly double mCooldownSeconds;
+
+        double mLastUpdateTime;
+        bool mIsOnCooldown;
+        double mSecondsOnCooldown;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/CooldownWindowDelayer.cs.meta b/Editor/PlasticSCM/UI/CooldownWindowDelayer.cs.meta
new file mode 100644
index 0000000..c2cb2a9
--- /dev/null
+++ b/Editor/PlasticSCM/UI/CooldownWindowDelayer.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 75e502da07ff345528edbecd094b5cb5
+timeCreated: 1541676676
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/DockEditorWindow.cs b/Editor/PlasticSCM/UI/DockEditorWindow.cs
new file mode 100644
index 0000000..d87e95b
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DockEditorWindow.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Reflection;
+
+using UnityEditor;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    [InitializeOnLoad]
+    internal static class DockEditorWindow
+    {
+        static DockEditorWindow()
+        {
+            InitializeInfo();
+        }
+
+        internal static bool IsAvailable()
+        {
+            return mParentField != null
+                && mAddTabMethod != null;
+        }
+
+        internal static void To(EditorWindow dockWindow, EditorWindow window)
+        {
+            var dockArea = mParentField.GetValue(dockWindow);
+
+            mAddTabMethod.Invoke(dockArea, new object[] { window });
+        }
+
+        static void InitializeInfo()
+        {
+            var flags = BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public | BindingFlags.Static;
+
+            mParentField = typeof(EditorWindow).GetField("m_Parent", flags);
+
+            var dockAreaType = typeof(EditorWindow).Assembly.GetType("UnityEditor.DockArea");
+
+            if (dockAreaType == null)
+                return;
+
+            mAddTabMethod = dockAreaType.GetMethod("AddTab", flags,
+                null, new Type[] { typeof(EditorWindow) }, null);
+        }
+
+        static MethodInfo mAddTabMethod;
+        static FieldInfo mParentField;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/DockEditorWindow.cs.meta b/Editor/PlasticSCM/UI/DockEditorWindow.cs.meta
new file mode 100644
index 0000000..011ca2d
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DockEditorWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3a6fba741cdd5fb4982a73a4d791754f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/DrawActionButton.cs b/Editor/PlasticSCM/UI/DrawActionButton.cs
new file mode 100644
index 0000000..4fb61d6
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DrawActionButton.cs
@@ -0,0 +1,21 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class DrawActionButton
+    {
+        internal static bool For(string buttonText)
+        {
+            GUIContent buttonContent = new GUIContent(buttonText);
+
+            GUIStyle buttonStyle = EditorStyles.miniButton;
+
+            Rect rt = GUILayoutUtility.GetRect(
+                buttonContent, buttonStyle,
+                GUILayout.MinWidth(UnityConstants.REGULAR_BUTTON_WIDTH));
+
+            return GUI.Button(rt, buttonText, buttonStyle);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/DrawActionButton.cs.meta b/Editor/PlasticSCM/UI/DrawActionButton.cs.meta
new file mode 100644
index 0000000..6393732
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DrawActionButton.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c08cfcfc4c2c46c46940ed103538acae
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/DrawActionHelpBox.cs b/Editor/PlasticSCM/UI/DrawActionHelpBox.cs
new file mode 100644
index 0000000..0242907
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DrawActionHelpBox.cs
@@ -0,0 +1,76 @@
+using System;
+
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class DrawActionHelpBox
+    {
+        internal static void For(
+            Texture image,
+            string labelText,
+            string buttonText,
+            Action buttonAction)
+        {
+            EditorGUILayout.BeginHorizontal(
+                EditorStyles.helpBox, GUILayout.MinHeight(40));
+
+            DoNotificationLabel(image, labelText);
+
+            GUILayout.Space(10);
+
+            DoActionButton(buttonText, buttonAction);
+
+            GUILayout.FlexibleSpace();
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoNotificationLabel(
+            Texture image, string labelText)
+        {
+            GUILayout.BeginVertical();
+
+            GUILayout.FlexibleSpace();
+
+            GUILayout.Label(
+                new GUIContent(labelText, image),
+                UnityStyles.HelpBoxLabel);
+
+            GUILayout.FlexibleSpace();
+
+            GUILayout.EndVertical();
+        }
+
+        static void DoActionButton(
+            string buttonText, Action buttonAction)
+        {
+            GUILayout.BeginVertical();
+
+            GUILayout.FlexibleSpace();
+
+            GUIContent buttonContent = new GUIContent(buttonText);
+
+            float width = GetButtonWidth(
+                buttonContent, EditorStyles.miniButton);
+
+            if (GUILayout.Button(
+                    buttonContent, EditorStyles.miniButton,
+                    GUILayout.MinWidth(Math.Max(50, width))))
+            {
+                buttonAction();
+            }
+
+            GUILayout.FlexibleSpace();
+
+            GUILayout.EndVertical();
+        }
+
+        static float GetButtonWidth(
+            GUIContent buttonContent, GUIStyle buttonStyle)
+        {
+            return buttonStyle.CalcSize(buttonContent).x + 10;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/DrawActionHelpBox.cs.meta b/Editor/PlasticSCM/UI/DrawActionHelpBox.cs.meta
new file mode 100644
index 0000000..0acbff8
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DrawActionHelpBox.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 30c4cfa3209d4a44480017a19ec5b3b8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/DrawSearchField.cs b/Editor/PlasticSCM/UI/DrawSearchField.cs
new file mode 100644
index 0000000..5598e82
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DrawSearchField.cs
@@ -0,0 +1,30 @@
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class DrawSearchField
+    {
+        internal static void For(
+            SearchField searchField,
+            TreeView treeView,
+            float width)
+        {
+            Rect searchFieldRect = GUILayoutUtility.GetRect(
+                width / 2, EditorGUIUtility.singleLineHeight);
+            searchFieldRect.y += 2;
+
+            treeView.searchString = searchField.OnToolbarGUI(
+                searchFieldRect, treeView.searchString);
+
+            if (!string.IsNullOrEmpty(treeView.searchString))
+                return;
+
+            GUI.Label(searchFieldRect, PlasticLocalization.GetString(
+                PlasticLocalization.Name.SearchTooltip), UnityStyles.Search);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/DrawSearchField.cs.meta b/Editor/PlasticSCM/UI/DrawSearchField.cs.meta
new file mode 100644
index 0000000..e2d2c2f
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DrawSearchField.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5474cb78511de04459cac50d50b9d9e0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/DrawSplitter.cs b/Editor/PlasticSCM/UI/DrawSplitter.cs
new file mode 100644
index 0000000..e271b97
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DrawSplitter.cs
@@ -0,0 +1,20 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class DrawSplitter
+    {
+        internal static void ForHorizontalIndicator()
+        {
+            GUIStyle style = UnityStyles.SplitterIndicator;
+
+            Rect splitterRect = GUILayoutUtility.GetRect(
+                EditorGUIUtility.currentViewWidth,
+                UnityConstants.SPLITTER_INDICATOR_HEIGHT,
+                style);
+
+            GUI.Label(splitterRect, string.Empty, style);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/DrawSplitter.cs.meta b/Editor/PlasticSCM/UI/DrawSplitter.cs.meta
new file mode 100644
index 0000000..c8e8fac
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DrawSplitter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ddfa6de84251ce4448a66bad9e7d326e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/DropDownTextField.cs b/Editor/PlasticSCM/UI/DropDownTextField.cs
new file mode 100644
index 0000000..c22f028
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DropDownTextField.cs
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class DropDownTextField
+    {
+        internal static string DoDropDownTextField(
+            string text,
+            string controlName,
+            List<string> dropDownOptions,
+            GenericMenu.MenuFunction2 optionSelected,
+            params GUILayoutOption[] options)
+        {
+            GUIContent textContent = new GUIContent(text);
+
+            Rect textFieldRect = GUILayoutUtility.GetRect(
+                textContent,
+                EditorStyles.textField,
+                options);
+
+            return DoDropDownTextField(
+                text,
+                controlName,
+                dropDownOptions,
+                optionSelected,
+                textFieldRect);
+        }
+
+        internal static string DoDropDownTextField(
+            string text,
+            string controlName,
+            List<string> dropDownOptions,
+            GenericMenu.MenuFunction2 optionSelected,
+            Rect textFieldRect)
+        {
+            Texture popupIcon = Images.GetDropDownIcon();
+
+            Rect popupButtonRect = new Rect(
+                textFieldRect.x + textFieldRect.width - BUTTON_WIDTH,
+                textFieldRect.y,
+                BUTTON_WIDTH,
+                textFieldRect.height);
+
+            if (GUI.Button(popupButtonRect, string.Empty, EditorStyles.label))
+            {
+                GenericMenu menu = new GenericMenu();
+                foreach (string option in dropDownOptions)
+                {
+                    menu.AddItem(
+                        new GUIContent(UnityMenuItem.EscapedText(option)),
+                        false,
+                        optionSelected,
+                        option);
+                }
+
+                menu.DropDown(textFieldRect);
+            }
+
+            Rect popupIconRect = new Rect(
+                popupButtonRect.x,
+                popupButtonRect.y + UnityConstants.DROPDOWN_ICON_Y_OFFSET,
+                popupButtonRect.width,
+                popupButtonRect.height);
+
+            GUI.SetNextControlName(controlName);
+            string result = GUI.TextField(textFieldRect, text);
+
+            GUI.Label(popupIconRect, popupIcon);
+
+            return result;
+        }
+
+        const int BUTTON_WIDTH = 16;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/DropDownTextField.cs.meta b/Editor/PlasticSCM/UI/DropDownTextField.cs.meta
new file mode 100644
index 0000000..10cdd06
--- /dev/null
+++ b/Editor/PlasticSCM/UI/DropDownTextField.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d2e4782a922433041be291edaf12421a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/EditorDispatcher.cs b/Editor/PlasticSCM/UI/EditorDispatcher.cs
new file mode 100644
index 0000000..0a4ff23
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorDispatcher.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using UnityEditor;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    [InitializeOnLoad]
+    internal static class EditorDispatcher
+    {
+        static EditorDispatcher()
+        {
+            mMainThread = Thread.CurrentThread;
+        }
+
+        internal static bool IsOnMainThread
+        {
+            get { return Thread.CurrentThread == mMainThread; } 
+        }
+
+        internal static void Dispatch(Action task)
+        {
+            lock (mDispatchQueue)
+            {
+                if (mDispatchQueue.Count == 0)
+                    EditorApplication.update += Update;
+
+                mDispatchQueue.Enqueue(task);
+            }
+        }
+
+        internal static void Update()
+        {
+            Action[] actions;
+
+            lock (mDispatchQueue)
+            {
+                if (mDispatchQueue.Count == 0)
+                    return;
+
+                actions = mDispatchQueue.ToArray();
+                mDispatchQueue.Clear();
+
+                EditorApplication.update -= Update;
+            }
+
+            foreach (Action action in actions)
+                action();
+        }
+
+        static readonly Queue<Action> mDispatchQueue = new Queue<Action>();
+        static Thread mMainThread;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/EditorDispatcher.cs.meta b/Editor/PlasticSCM/UI/EditorDispatcher.cs.meta
new file mode 100644
index 0000000..4047e0d
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorDispatcher.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: de4aea75bc204d14cb432cf1708548f1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/EditorProgressBar.cs b/Editor/PlasticSCM/UI/EditorProgressBar.cs
new file mode 100644
index 0000000..b8d0ca6
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorProgressBar.cs
@@ -0,0 +1,39 @@
+using System.Linq;
+using System.Reflection;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class EditorProgressBar
+    {
+        static EditorProgressBar()
+        {
+            var type = typeof(UnityEditor.Editor).Assembly.GetTypes().Where(
+                t => t.Name == "AsyncProgressBar").FirstOrDefault();
+
+            if (type == null)
+                return;
+
+            mDisplayMethod = type.GetMethod("Display");
+            mClearMethod = type.GetMethod("Clear");
+        }
+
+        internal static void ShowProgressBar(string text, float progress)
+        {
+            if (mDisplayMethod == null)
+                return;
+
+            mDisplayMethod.Invoke(null, new object[] { text, progress });
+        }
+
+        internal static void ClearProgressBar()
+        {
+            if (mClearMethod == null)
+                return;
+
+            mClearMethod.Invoke(null, null);
+        }
+
+        static MethodInfo mDisplayMethod = null;
+        static MethodInfo mClearMethod = null;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/UI/EditorProgressBar.cs.meta b/Editor/PlasticSCM/UI/EditorProgressBar.cs.meta
new file mode 100644
index 0000000..12cec92
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorProgressBar.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 245d2c4b912b39a4784287979ea8cfd9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/EditorProgressControls.cs b/Editor/PlasticSCM/UI/EditorProgressControls.cs
new file mode 100644
index 0000000..89eaf57
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorProgressControls.cs
@@ -0,0 +1,54 @@
+using Codice.Client.Common;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class EditorProgressControls : IProgressControls
+    {
+        internal EditorProgressControls(GuiMessage.IGuiMessage guiMessage)
+        {
+            mGuiMessage = guiMessage;
+        }
+
+        void IProgressControls.HideProgress()
+        {
+            EditorProgressBar.ClearProgressBar();
+        }
+
+        void IProgressControls.ShowError(string message)
+        {
+            mGuiMessage.ShowError(message);
+        }
+
+        void IProgressControls.ShowNotification(string message)
+        {
+            mGuiMessage.ShowMessage(
+                UnityConstants.PLASTIC_WINDOW_TITLE,
+                message,
+                GuiMessage.GuiMessageType.Informational);
+        }
+
+        void IProgressControls.ShowProgress(string message)
+        {
+            EditorProgressBar.ShowProgressBar(message, 1f);
+        }
+
+        void IProgressControls.ShowSuccess(string message)
+        {
+            mGuiMessage.ShowMessage(
+                UnityConstants.PLASTIC_WINDOW_TITLE,
+                message,
+                GuiMessage.GuiMessageType.Informational);
+        }
+
+        void IProgressControls.ShowWarning(string message)
+        {
+            mGuiMessage.ShowMessage(
+                UnityConstants.PLASTIC_WINDOW_TITLE,
+                message,
+                GuiMessage.GuiMessageType.Warning);
+        }
+
+        GuiMessage.IGuiMessage mGuiMessage;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/EditorProgressControls.cs.meta b/Editor/PlasticSCM/UI/EditorProgressControls.cs.meta
new file mode 100644
index 0000000..9ec33f2
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorProgressControls.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e436e24eba68eff48b3fb264ad0ab953
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/EditorVersion.cs b/Editor/PlasticSCM/UI/EditorVersion.cs
new file mode 100644
index 0000000..59060fd
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorVersion.cs
@@ -0,0 +1,75 @@
+using System;
+
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class EditorVersion
+    {
+        internal int Year;
+        internal int Release;
+        internal int Update;
+
+        EditorVersion(int year, int release, int update)
+        {
+            Year = year;
+            Release = release;
+            Update = update;
+        }
+
+
+        public override string ToString()
+        {
+            return String.Format("{0}.{1}.{2}", Year, Release, Update);
+        }
+
+        internal static bool IsCurrentEditorOlderThan(string version)
+        {
+            return IsEditorOlderThan(Application.unityVersion, version);
+        }
+
+        internal static bool IsEditorOlderThan(string versionA, string versionB)
+        {
+#if UNITY_2017_1_OR_NEWER
+            var editorA = Parse(versionA);
+            var editorB = Parse(versionB);
+            if (editorA.Year == editorB.Year)
+            {
+                if (editorA.Release == editorB.Release)
+                {
+                    return editorA.Update < editorB.Update;
+                }
+                return editorA.Release < editorB.Release;
+            }
+            return editorA.Year < editorB.Year;
+#else
+            return false;
+#endif
+        }
+
+        static int ParseUpdateString(string version)
+        {
+            int pos = 0;
+            char[] characters = version.ToCharArray();
+            while (Char.IsDigit(characters[pos]))
+            {
+                ++pos;
+            }
+            return int.Parse(version.Substring(0, pos));
+        }
+
+        static EditorVersion Parse(string version)
+        {
+            var versions = version.Split('.');
+
+            var year = 0;
+            year = int.Parse(versions[0]);
+            var release = 0;
+            release = int.Parse(versions[1]);
+            var update = 0;
+            update = ParseUpdateString(versions[2]);
+
+            return new EditorVersion(year, release, update);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/EditorVersion.cs.meta b/Editor/PlasticSCM/UI/EditorVersion.cs.meta
new file mode 100644
index 0000000..5fafb51
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorVersion.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0e1e2d80d9c79b042ab42fdf0b5c0b65
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/EditorWindowFocus.cs b/Editor/PlasticSCM/UI/EditorWindowFocus.cs
new file mode 100644
index 0000000..1096475
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorWindowFocus.cs
@@ -0,0 +1,46 @@
+using System;
+
+using UnityEditor;
+using UnityEditorInternal;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    [InitializeOnLoad]
+    internal static class EditorWindowFocus
+    {
+        internal static event Action OnApplicationActivated;
+        internal static event Action OnApplicationDeactivated;
+
+        static EditorWindowFocus()
+        {
+            EditorApplication.update += Update;
+        }
+
+        static void Update()
+        {
+            bool isApplicationActive = InternalEditorUtility.isApplicationActive;
+
+            if (!mLastIsApplicationFocused && isApplicationActive)
+            {
+                mLastIsApplicationFocused = isApplicationActive;
+
+                if (OnApplicationActivated != null)
+                    OnApplicationActivated();
+
+                return;
+            }
+
+            if (mLastIsApplicationFocused && !isApplicationActive)
+            {
+                mLastIsApplicationFocused = isApplicationActive;
+
+                if (OnApplicationDeactivated != null)
+                    OnApplicationDeactivated();
+
+                return;
+            }
+        }
+
+        static bool mLastIsApplicationFocused;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/EditorWindowFocus.cs.meta b/Editor/PlasticSCM/UI/EditorWindowFocus.cs.meta
new file mode 100644
index 0000000..4156057
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EditorWindowFocus.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 84ce5571ebc476e45b6c9bc6644599c2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/EnumPopupSetting.cs b/Editor/PlasticSCM/UI/EnumPopupSetting.cs
new file mode 100644
index 0000000..bc28667
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EnumPopupSetting.cs
@@ -0,0 +1,47 @@
+using System;
+
+using UnityEditor;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class EnumPopupSetting<E>
+    {
+        internal static E Load(
+            string popupSettingName,
+            E defaultValue)
+        {
+            string enumValue = EditorPrefs.GetString(
+                GetSettingKey(popupSettingName));
+
+            if (string.IsNullOrEmpty(enumValue))
+                return defaultValue;
+
+            return (E)Enum.Parse(typeof(E), enumValue);
+        }
+
+        internal static void Save(
+            E selected,
+            string popupSettingName)
+        {
+            EditorPrefs.SetString(
+                GetSettingKey(popupSettingName),
+                selected.ToString());
+        }
+
+        internal static void Clear(
+            string popupSettingName)
+        {
+            EditorPrefs.DeleteKey(
+                GetSettingKey(popupSettingName));
+        }
+
+        static string GetSettingKey(string popupSettingName)
+        {
+            return string.Format(
+                popupSettingName, PlayerSettings.productGUID,
+                SELECTED_ENUM_VALUE_KEY);
+        }
+
+        static string SELECTED_ENUM_VALUE_KEY = "SelectedEnumValue";
+    }
+}
diff --git a/Editor/PlasticSCM/UI/EnumPopupSetting.cs.meta b/Editor/PlasticSCM/UI/EnumPopupSetting.cs.meta
new file mode 100644
index 0000000..5cf34aa
--- /dev/null
+++ b/Editor/PlasticSCM/UI/EnumPopupSetting.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: de396a7891b8b7f4f9649c3ccee67421
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/FindEditorWindow.cs b/Editor/PlasticSCM/UI/FindEditorWindow.cs
new file mode 100644
index 0000000..795278d
--- /dev/null
+++ b/Editor/PlasticSCM/UI/FindEditorWindow.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class FindEditorWindow
+    {
+        internal static EditorWindow ProjectWindow()
+        {
+            Type projectBrowserType = typeof(EditorWindow).Assembly.GetType(
+                    "UnityEditor.ProjectBrowser");
+
+            UnityEngine.Object[] windows = Resources.FindObjectsOfTypeAll(
+                 projectBrowserType);
+
+            if (windows.Length == 0)
+                return null;
+
+            return windows[0] as EditorWindow;
+        }
+
+        internal static EditorWindow ToDock<T>()
+        {
+            List<EditorWindow> windows = GetAvailableWindows();
+
+            IEnumerable<EditorWindow> candidateWindows = windows
+                .Where(w => !(w is T))
+                .Where(w => w.position.width > 400 && w.position.height > 300)
+                .OrderByDescending(w => w.position.width * w.position.height);
+
+            return candidateWindows.FirstOrDefault();
+        }
+
+        static List<EditorWindow> GetAvailableWindows()
+        {
+            List<EditorWindow> result = new List<EditorWindow>();
+
+            var hostViewField = typeof(EditorWindow).GetField(
+                "m_Parent", BindingFlags.Instance | BindingFlags.NonPublic);
+
+            if (hostViewField == null)
+                return null;
+
+            var hostViewType = hostViewField.FieldType;
+            var actualViewField = hostViewType.GetField(
+                "m_ActualView", BindingFlags.Instance | BindingFlags.NonPublic);
+
+            if (actualViewField == null)
+                return null;
+
+            foreach (var window in Resources.FindObjectsOfTypeAll<EditorWindow>())
+            {
+                var hostView = hostViewField.GetValue(window);
+
+                if (hostView == null)
+                    continue;
+
+                EditorWindow actualDrawnWindow = actualViewField
+                    .GetValue(hostView) as EditorWindow;
+
+                if (actualDrawnWindow == null)
+                    continue;
+
+                if (result.Contains(actualDrawnWindow))
+                    continue;
+
+                result.Add(actualDrawnWindow);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/FindEditorWindow.cs.meta b/Editor/PlasticSCM/UI/FindEditorWindow.cs.meta
new file mode 100644
index 0000000..a93ad32
--- /dev/null
+++ b/Editor/PlasticSCM/UI/FindEditorWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0f5401cd5ff8fc4409bf9540072b14bc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/GUIActionRunner.cs b/Editor/PlasticSCM/UI/GUIActionRunner.cs
new file mode 100644
index 0000000..9109263
--- /dev/null
+++ b/Editor/PlasticSCM/UI/GUIActionRunner.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Threading;
+
+using Codice.LogWrapper;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class GUIActionRunner
+    {
+        internal delegate void ActionDelegate();
+
+        internal static void RunGUIAction(ActionDelegate action)
+        {
+            if (EditorDispatcher.IsOnMainThread)
+            {
+                action();
+                return;
+            }
+
+            lock (mLock)
+            {
+                ManualResetEvent syncEvent = new ManualResetEvent(false);
+
+                EditorDispatcher.Dispatch(delegate {
+                    try
+                    {
+                        action();
+                    }
+                    catch (Exception e)
+                    {
+                        mLog.ErrorFormat("GUI action failed: {0}", e.Message);
+                        mLog.DebugFormat("Stack trace:{0}{1}", Environment.NewLine, e.StackTrace);
+                        throw;
+                    }
+                    finally
+                    {
+                        syncEvent.Set();
+                    }
+                });
+
+                syncEvent.WaitOne();
+            }
+        }
+
+        static object mLock = new object();
+
+        static readonly ILog mLog = LogManager.GetLogger("GUIActionRunner");
+    }
+}
diff --git a/Editor/PlasticSCM/UI/GUIActionRunner.cs.meta b/Editor/PlasticSCM/UI/GUIActionRunner.cs.meta
new file mode 100644
index 0000000..85cb1e4
--- /dev/null
+++ b/Editor/PlasticSCM/UI/GUIActionRunner.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6dbc54b503a79034d9c544e39451fd10
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/GUISpace.cs b/Editor/PlasticSCM/UI/GUISpace.cs
new file mode 100644
index 0000000..baafea7
--- /dev/null
+++ b/Editor/PlasticSCM/UI/GUISpace.cs
@@ -0,0 +1,14 @@
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class GUISpace
+    {
+        internal static void ForToolbar()
+        {
+#if UNITY_2019_1_OR_NEWER
+            GUILayout.Space(5);
+#endif
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/GUISpace.cs.meta b/Editor/PlasticSCM/UI/GUISpace.cs.meta
new file mode 100644
index 0000000..700a483
--- /dev/null
+++ b/Editor/PlasticSCM/UI/GUISpace.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f9e9ce5a8dd0eb74fa5f90576a7fab4d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/GetPlasticShortcut.cs b/Editor/PlasticSCM/UI/GetPlasticShortcut.cs
new file mode 100644
index 0000000..284a2bd
--- /dev/null
+++ b/Editor/PlasticSCM/UI/GetPlasticShortcut.cs
@@ -0,0 +1,52 @@
+using Codice.Utils;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class GetPlasticShortcut
+    {
+        internal static string ForOpen()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.UnityOpenShortcut);
+        }
+
+        internal static string ForDelete()
+        {
+            if (PlatformIdentifier.IsWindows())
+                return PlasticLocalization.GetString(
+                    PlasticLocalization.Name.UnityDeleteShortcutForWindows);
+
+            if (PlatformIdentifier.IsMac())
+                return PlasticLocalization.GetString(
+                    PlasticLocalization.Name.UnityDeleteShortcutForMacOS);
+
+            return string.Empty;
+        }
+
+        internal static string ForDiff()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.UnityDiffShortcut);
+        }
+
+        internal static string ForAssetDiff()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.UnityAssetDiffShortcut);
+        }
+
+        internal static string ForHistory()
+        {
+            if (PlatformIdentifier.IsWindows())
+                return PlasticLocalization.GetString(
+                    PlasticLocalization.Name.UnityHistoryShortcutForWindows);
+
+            if (PlatformIdentifier.IsMac())
+                return PlasticLocalization.GetString(
+                    PlasticLocalization.Name.UnityHistoryShortcutForMacOS);
+
+            return string.Empty;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/GetPlasticShortcut.cs.meta b/Editor/PlasticSCM/UI/GetPlasticShortcut.cs.meta
new file mode 100644
index 0000000..a8b91ea
--- /dev/null
+++ b/Editor/PlasticSCM/UI/GetPlasticShortcut.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 65c9d93f86da86b41a712d92e8f03dc2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/GuiEnabled.cs b/Editor/PlasticSCM/UI/GuiEnabled.cs
new file mode 100644
index 0000000..f221f42
--- /dev/null
+++ b/Editor/PlasticSCM/UI/GuiEnabled.cs
@@ -0,0 +1,22 @@
+using System;
+
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class GuiEnabled : IDisposable
+    {
+        internal GuiEnabled(bool enabled)
+        {
+            mEnabled = GUI.enabled;
+            GUI.enabled = enabled && mEnabled;
+        }
+
+        void IDisposable.Dispose()
+        {
+            GUI.enabled = mEnabled;
+        }
+
+        bool mEnabled;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/GuiEnabled.cs.meta b/Editor/PlasticSCM/UI/GuiEnabled.cs.meta
new file mode 100644
index 0000000..5299642
--- /dev/null
+++ b/Editor/PlasticSCM/UI/GuiEnabled.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3a4d828da4d125740924da08b5fbe1cb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/HandleMenuItem.cs b/Editor/PlasticSCM/UI/HandleMenuItem.cs
new file mode 100644
index 0000000..fa0fda6
--- /dev/null
+++ b/Editor/PlasticSCM/UI/HandleMenuItem.cs
@@ -0,0 +1,77 @@
+using PlasticGui;
+using System;
+using System.Reflection;
+
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class HandleMenuItem
+    {
+        internal static void AddMenuItem(
+            string name, int priority,
+            Action execute, Func<bool> validate)
+        {
+            AddMenuItem(name, string.Empty, priority, execute, validate);
+        }
+
+        internal static void AddMenuItem(
+            string name, string shortcut, int priority,
+            Action execute, Func<bool> validate)
+        {
+            MethodInfo InternalAddMenuItem = MenuType.GetMethod(
+                "AddMenuItem",
+                BindingFlags.Static | BindingFlags.NonPublic);
+
+            if (InternalAddMenuItem == null)
+            {
+                Debug.LogWarningFormat(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ErrorAddPlasticSCMMenuItem),
+                    name);
+                return;
+            }
+
+            InternalAddMenuItem.Invoke(
+                null, new object[] {
+                    name, shortcut, false,
+                    priority, execute, validate });
+        }
+
+        internal static void RemoveMenuItem(string name)
+        {
+            MethodInfo InternalRemoveMenuItem = MenuType.GetMethod(
+                "RemoveMenuItem",
+                BindingFlags.Static | BindingFlags.NonPublic);
+
+            if (InternalRemoveMenuItem == null)
+            {
+                Debug.LogWarningFormat(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ErrorRemovePlasticSCMMenuItem),
+                    name);
+                return;
+            }
+
+            InternalRemoveMenuItem.Invoke(
+                null, new object[] { name });
+        }
+
+        internal static void UpdateAllMenus()
+        {
+            MethodInfo InternalUpdateAllMenus = EditorUtilityType.GetMethod(
+                "Internal_UpdateAllMenus",
+                BindingFlags.Static | BindingFlags.NonPublic);
+
+            if (InternalUpdateAllMenus == null)
+            {
+                Debug.LogWarning(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ErrorUpdatePlasticSCMMenus));
+                return;
+            }
+
+            InternalUpdateAllMenus.Invoke(null, null);
+        }
+
+        static readonly Type MenuType = typeof(UnityEditor.Menu);
+        static readonly Type EditorUtilityType = typeof(UnityEditor.EditorUtility);
+    }
+}
diff --git a/Editor/PlasticSCM/UI/HandleMenuItem.cs.meta b/Editor/PlasticSCM/UI/HandleMenuItem.cs.meta
new file mode 100644
index 0000000..1919a0c
--- /dev/null
+++ b/Editor/PlasticSCM/UI/HandleMenuItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 01023c055f6f08e408b78d36d5f7a803
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Images.cs b/Editor/PlasticSCM/UI/Images.cs
new file mode 100644
index 0000000..9fa4e2a
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Images.cs
@@ -0,0 +1,381 @@
+using System.IO;
+using System.Reflection;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.LogWrapper;
+using Codice.Utils;
+using PlasticGui;
+using PlasticGui.Help;
+using Unity.PlasticSCM.Editor.AssetUtils;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class Images
+    {
+        internal enum Name
+        {
+            None,
+
+            IconPlastic,
+            IconCloseButton,
+            IconPressedCloseButton,
+            IconAdded,
+            IconDeleted,
+            IconChanged,
+            IconMoved,
+            IconMergeLink,
+            Ignored,
+            IconMergeConflict,
+            IconMerged,
+            IconFsChanged,
+            IconMergeCategory,
+            XLink,
+            Ok,
+            NotOnDisk,
+            IconRepository,
+            IconPlasticView,
+            Loading,
+
+            IconEmptyGravatar,
+            Step1,
+            Step2,
+            Step3,
+            StepOk,
+            ButtonSsoSignInUnity,
+            ButtonSsoSignInEmail,
+            ButtonSsoSignInGoogle,
+        }
+
+        internal static Texture2D GetHelpImage(HelpImage image)
+        {
+            // We use the dark version for both the light/dark skins since it matches the grey background better
+            string helpImageFileName = string.Format(
+                "d_{0}.png",
+                HelpImageName.FromHelpImage(image));
+
+            string imageRelativePath = GetImageFileRelativePath(helpImageFileName);
+            Texture2D result = TryLoadImage(imageRelativePath, imageRelativePath);
+
+            if (result != null)
+                return result;
+
+            mLog.WarnFormat("Image not found: {0}", helpImageFileName);
+            return GetEmptyImage();
+        }
+
+        internal static Texture2D GetImage(Name image)
+        {
+            string imageFileName = image.ToString().ToLower() + ".png";
+            string imageFileName2x = image.ToString().ToLower() + "@2x.png";
+
+            string darkImageFileName = string.Format("d_{0}", imageFileName);
+            string darkImageFileName2x = string.Format("d_{0}", imageFileName2x);
+
+            string imageFileRelativePath = GetImageFileRelativePath(imageFileName);
+            string imageFileRelativePath2x = GetImageFileRelativePath(imageFileName);
+
+            string darkImageFileRelativePath = GetImageFileRelativePath(darkImageFileName);
+            string darkImageFileRelativePath2x = GetImageFileRelativePath(darkImageFileName2x);
+
+            Texture2D result = null;
+
+            if (EditorGUIUtility.isProSkin)
+                result = TryLoadImage(darkImageFileRelativePath, darkImageFileRelativePath2x);
+
+            if (result != null)
+                return result;
+
+            result = TryLoadImage(imageFileRelativePath, imageFileRelativePath2x);
+
+            if (result != null)
+                return result;
+
+            mLog.WarnFormat("Image not found: {0}", imageFileName);
+            return GetEmptyImage();
+        }
+
+        internal static Texture GetFileIcon(string path)
+        {
+            string relativePath = GetRelativePath.ToApplication(path);
+
+            return GetFileIconFromRelativePath(relativePath);
+        }
+
+        internal static Texture GetFileIconFromCmPath(string path)
+        {
+            return GetFileIconFromRelativePath(
+                path.Substring(1).Replace("/",
+                Path.DirectorySeparatorChar.ToString()));
+        }
+
+        internal static Texture GetDropDownIcon()
+        {
+            if (mPopupIcon == null)
+                mPopupIcon = EditorGUIUtility.IconContent("icon dropdown").image;
+
+            return mPopupIcon;
+        }
+
+        internal static Texture GetDirectoryIcon()
+        {
+            if (mDirectoryIcon == null)
+                mDirectoryIcon = EditorGUIUtility.IconContent("Folder Icon").image;
+
+            return mDirectoryIcon;
+        }
+
+        internal static Texture GetPrivatedOverlayIcon()
+        {
+            if (mPrivatedOverlayIcon == null)
+                mPrivatedOverlayIcon = EditorGUIUtility.IconContent("P4_Local").image;
+
+            return mPrivatedOverlayIcon;
+        }
+
+        internal static Texture GetAddedOverlayIcon()
+        {
+            if (mAddedOverlayIcon == null)
+                mAddedOverlayIcon = EditorGUIUtility.IconContent("P4_AddedLocal").image;
+
+            return mAddedOverlayIcon;
+        }
+
+        internal static Texture GetDeletedOverlayIcon()
+        {
+            if (mDeletedOverlayIcon == null)
+                mDeletedOverlayIcon = EditorGUIUtility.IconContent("P4_DeletedLocal").image;
+
+            return mDeletedOverlayIcon;
+        }
+
+        internal static Texture GetCheckedOutOverlayIcon()
+        {
+            if (mCheckedOutOverlayIcon == null)
+                mCheckedOutOverlayIcon = EditorGUIUtility.IconContent("P4_CheckOutLocal").image;
+
+            return mCheckedOutOverlayIcon;
+        }
+
+        internal static Texture GetDeletedRemoteOverlayIcon()
+        {
+            if (mDeletedRemoteOverlayIcon == null)
+                mDeletedRemoteOverlayIcon = EditorGUIUtility.IconContent("P4_DeletedRemote").image;
+
+            return mDeletedRemoteOverlayIcon;
+        }
+
+        internal static Texture GetOutOfSyncOverlayIcon()
+        {
+            if (mOutOfSyncOverlayIcon == null)
+                mOutOfSyncOverlayIcon = EditorGUIUtility.IconContent("P4_OutOfSync").image;
+
+            return mOutOfSyncOverlayIcon;
+        }
+
+        internal static Texture GetConflictedOverlayIcon()
+        {
+            if (mConflictedOverlayIcon == null)
+                mConflictedOverlayIcon = EditorGUIUtility.IconContent("P4_Conflicted").image;
+
+            return mConflictedOverlayIcon;
+        }
+
+        internal static Texture GetLockedLocalOverlayIcon()
+        {
+            if (mLockedLocalOverlayIcon == null)
+                mLockedLocalOverlayIcon = EditorGUIUtility.IconContent("P4_LockedLocal").image;
+
+            return mLockedLocalOverlayIcon;
+        }
+
+        internal static Texture GetLockedRemoteOverlayIcon()
+        {
+            if (mLockedRemoteOverlayIcon == null)
+                mLockedRemoteOverlayIcon = EditorGUIUtility.IconContent("P4_LockedRemote").image;
+
+            return mLockedRemoteOverlayIcon;
+        }
+
+        internal static Texture GetWarnIcon()
+        {
+            if (mWarnIcon == null)
+                mWarnIcon = EditorGUIUtility.IconContent("console.warnicon.sml").image;
+
+            return mWarnIcon;
+        }
+
+        internal static Texture GetInfoIcon()
+        {
+            if (mInfoIcon == null)
+                mInfoIcon = EditorGUIUtility.IconContent("console.infoicon.sml").image;
+
+            return mInfoIcon;
+        }
+
+        internal static Texture GetErrorDialogIcon()
+        {
+            if (mErrorDialogIcon == null)
+                mErrorDialogIcon = EditorGUIUtility.IconContent("console.erroricon").image;
+
+            return mErrorDialogIcon;
+        }
+
+        internal static Texture GetWarnDialogIcon()
+        {
+            if (mWarnDialogIcon == null)
+                mWarnDialogIcon = EditorGUIUtility.IconContent("console.warnicon").image;
+
+            return mWarnDialogIcon;
+        }
+
+        internal static Texture GetInfoDialogIcon()
+        {
+            if (mInfoDialogIcon == null)
+                mInfoDialogIcon = EditorGUIUtility.IconContent("console.infoicon").image;
+
+            return mInfoDialogIcon;
+        }
+
+        internal static Texture GetRefreshIcon()
+        {
+            if (mRefreshIcon == null)
+                mRefreshIcon = EditorGUIUtility.FindTexture("Refresh");
+
+            return mRefreshIcon;
+        }
+
+        internal static Texture GetCloseIcon()
+        {
+            if (mCloseIcon == null)
+                mCloseIcon = EditorGUIUtility.FindTexture("winbtn_win_close");
+
+            return mCloseIcon;
+        }
+
+        internal static Texture GetClickedCloseIcon()
+        {
+            if (mClickedCloseIcon == null)
+                mClickedCloseIcon = EditorGUIUtility.FindTexture("winbtn_win_close_a");
+
+            return mClickedCloseIcon;
+        }
+
+        internal static Texture GetHoveredCloseIcon()
+        {
+            if (mHoveredCloseIcon == null)
+                mHoveredCloseIcon = EditorGUIUtility.FindTexture("winbtn_win_close_h");
+
+            return mHoveredCloseIcon;
+        }
+
+        internal static Texture GetFileIcon()
+        {
+            if (mFileIcon == null)
+                mFileIcon = EditorGUIUtility.FindTexture("DefaultAsset Icon");
+
+            if (mFileIcon == null)
+                mFileIcon = AssetPreview.GetMiniTypeThumbnail(typeof(DefaultAsset));
+
+            if (mFileIcon == null)
+                mFileIcon = GetEmptyImage();
+
+            return mFileIcon;
+        }
+
+        internal static Texture2D GetLinkUnderlineImage()
+        {
+            if (mLinkUnderlineImage == null)
+            {
+                mLinkUnderlineImage = new Texture2D(1, 1);
+                mLinkUnderlineImage.SetPixel(0, 0, UnityStyles.Colors.Link);
+                mLinkUnderlineImage.Apply();
+            }
+
+            return mLinkUnderlineImage;
+        }
+
+        static Texture2D GetEmptyImage()
+        {
+            if (mEmptyImage == null)
+            {
+                mEmptyImage = new Texture2D(1, 1);
+                mEmptyImage.SetPixel(0, 0, Color.clear);
+                mEmptyImage.Apply();
+            }
+
+            return mEmptyImage;
+        }
+
+        static Texture GetFileIconFromRelativePath(string relativePath)
+        {
+            Texture result = AssetDatabase.GetCachedIcon(relativePath);
+
+            if (result == null)
+                return GetFileIcon();
+
+            return result;
+        }
+
+        static string GetImageFileRelativePath(string imageFileName)
+        {
+            return Path.Combine(
+                AssetsPath.GetImagesFolderRelativePath(),
+                imageFileName);
+        }
+
+        static Texture2D TryLoadImage(string imageFileRelativePath, string image2xFilePath)
+        {
+            if (EditorGUIUtility.pixelsPerPoint > 1f && File.Exists(image2xFilePath))
+                return LoadTextureFromFile(image2xFilePath);
+
+            if (File.Exists(Path.GetFullPath(imageFileRelativePath)))
+                return LoadTextureFromFile(imageFileRelativePath);
+
+            return null;
+        }
+
+        static Texture2D LoadTextureFromFile(string path)
+        {
+            byte[] fileData = File.ReadAllBytes(path);
+            Texture2D result = new Texture2D(1, 1);
+            result.LoadImage(fileData); //auto-resizes the texture dimensions
+            return result;
+        }
+
+        static Texture mFileIcon;
+        static Texture mDirectoryIcon;
+
+        static Texture mPrivatedOverlayIcon;
+        static Texture mAddedOverlayIcon;
+        static Texture mDeletedOverlayIcon;
+        static Texture mCheckedOutOverlayIcon;
+        static Texture mDeletedRemoteOverlayIcon;
+        static Texture mOutOfSyncOverlayIcon;
+        static Texture mConflictedOverlayIcon;
+        static Texture mLockedLocalOverlayIcon;
+        static Texture mLockedRemoteOverlayIcon;
+
+        static Texture mWarnIcon;
+        static Texture mInfoIcon;
+
+        static Texture mErrorDialogIcon;
+        static Texture mWarnDialogIcon;
+        static Texture mInfoDialogIcon;
+
+        static Texture mRefreshIcon;
+
+        static Texture mCloseIcon;
+        static Texture mClickedCloseIcon;
+        static Texture mHoveredCloseIcon;
+
+        static Texture2D mLinkUnderlineImage;
+
+        static Texture2D mEmptyImage;
+
+        static Texture mPopupIcon;
+
+        static readonly ILog mLog = LogManager.GetLogger("Images");
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/UI/Images.cs.meta b/Editor/PlasticSCM/UI/Images.cs.meta
new file mode 100644
index 0000000..5b79754
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Images.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d765c78b18a58b14a986b34841ae9c52
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/MeasureMaxWidth.cs b/Editor/PlasticSCM/UI/MeasureMaxWidth.cs
new file mode 100644
index 0000000..d538075
--- /dev/null
+++ b/Editor/PlasticSCM/UI/MeasureMaxWidth.cs
@@ -0,0 +1,26 @@
+using System;
+
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class MeasureMaxWidth
+    {
+        internal static float ForTexts(GUIStyle style, params string[] texts)
+        {
+            float result = 0;
+
+            GUIContent content = new GUIContent();
+
+            foreach (string text in texts)
+            {
+                content.text = text;
+
+                result = Math.Max(result,
+                    style.CalcSize(content).x);
+            }
+
+            return result + 10;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/MeasureMaxWidth.cs.meta b/Editor/PlasticSCM/UI/MeasureMaxWidth.cs.meta
new file mode 100644
index 0000000..7060cff
--- /dev/null
+++ b/Editor/PlasticSCM/UI/MeasureMaxWidth.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5eeef8c7e006fbe49ab66c960691f11e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Message.meta b/Editor/PlasticSCM/UI/Message.meta
new file mode 100644
index 0000000..8c1afda
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Message.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 505d068a241298242a99aa9dd5b1701e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Message/DrawDialogIcon.cs b/Editor/PlasticSCM/UI/Message/DrawDialogIcon.cs
new file mode 100644
index 0000000..9d57b64
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Message/DrawDialogIcon.cs
@@ -0,0 +1,46 @@
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.Common;
+
+namespace Unity.PlasticSCM.Editor.UI.Message
+{
+    internal static class DrawDialogIcon
+    {
+        internal static void ForMessage(GuiMessage.GuiMessageType alertType)
+        {
+            using (new EditorGUILayout.VerticalScope(GUILayout.Width(80)))
+            {
+                Rect iconRect = GUILayoutUtility.GetRect(
+                    GUIContent.none, EditorStyles.label,
+                    GUILayout.Width(60), GUILayout.Height(60));
+
+                GUI.DrawTexture(
+                    iconRect,
+                    Images.GetImage(Images.Name.IconPlastic),
+                    ScaleMode.ScaleToFit);
+
+                Rect overlayIconRect = new Rect(
+                    iconRect.xMax - 30, iconRect.yMax - 24, 32, 32);
+
+                GUI.DrawTexture(
+                    overlayIconRect,
+                    GetHelpIcon(alertType),
+                    ScaleMode.ScaleToFit);
+            }
+        }
+
+        static Texture GetHelpIcon(GuiMessage.GuiMessageType alertType)
+        {
+            switch (alertType)
+            {
+                case GuiMessage.GuiMessageType.Critical:
+                    return Images.GetErrorDialogIcon();
+                case GuiMessage.GuiMessageType.Warning:
+                    return Images.GetWarnDialogIcon();
+                default:
+                    return Images.GetInfoDialogIcon();
+            }
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Message/DrawDialogIcon.cs.meta b/Editor/PlasticSCM/UI/Message/DrawDialogIcon.cs.meta
new file mode 100644
index 0000000..4d53060
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Message/DrawDialogIcon.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fecc10e44f8b64a48a83531ef9c23df0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Message/PlasticQuestionAlert.cs b/Editor/PlasticSCM/UI/Message/PlasticQuestionAlert.cs
new file mode 100644
index 0000000..c788a4b
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Message/PlasticQuestionAlert.cs
@@ -0,0 +1,202 @@
+using System;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.Common;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.UI.Message
+{
+    internal class PlasticQuestionAlert : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+
+                string buttonsText = mFirst + mSecond + (mThird ?? string.Empty);
+
+                int textWidth = (int)((GUIStyle)UnityStyles.Dialog.AcceptButtonText)
+                    .CalcSize(new GUIContent(buttonsText)).x;
+
+                return new Rect(
+                    baseRect.x, baseRect.y,
+                    Math.Max(500, textWidth + 150), 180);
+            }
+        }
+
+        internal static ResponseType Show(
+            string title,
+            string message, string first,
+            string second, string third,
+            bool isFirstButtonEnabled,
+            GuiMessage.GuiMessageType alertType,
+            EditorWindow parentWindow)
+        {
+            PlasticQuestionAlert alert = Create(
+                title, message, first, second, third,
+                isFirstButtonEnabled, alertType);
+            return alert.RunModal(parentWindow);
+        }
+
+        protected override void OnModalGUI()
+        {
+            DoMessageArea();
+
+            GUILayout.FlexibleSpace();
+
+            GUILayout.Space(20);
+
+            DoButtonsArea();
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.PlasticSCM);
+        }
+
+        void DoMessageArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                DrawDialogIcon.ForMessage(mAlertType);
+
+                using (new EditorGUILayout.VerticalScope())
+                {
+                    GUILayout.Label(mTitle, UnityStyles.Dialog.MessageTitle);
+                    GUIContent message = new GUIContent(mMessage);
+
+                    Rect lastRect = GUILayoutUtility.GetLastRect();
+                    GUIStyle scrollPlaceholder = new GUIStyle(UnityStyles.Dialog.MessageText);
+                    scrollPlaceholder.normal.textColor = Color.clear;
+                    scrollPlaceholder.clipping = TextClipping.Clip;
+
+                    if (Event.current.type == EventType.Repaint)
+                    {
+                        mMessageDesiredHeight = ((GUIStyle)UnityStyles.Dialog.MessageText)
+                            .CalcHeight(message, lastRect.width - 20) + 20;
+                        mMessageViewHeight = Mathf.Min(mMessageDesiredHeight, 60);
+                    }
+
+                    GUILayout.Space(mMessageViewHeight);
+
+                    Rect scrollPanelRect = new Rect(
+                        lastRect.xMin, lastRect.yMax,
+                        lastRect.width + 20, mMessageViewHeight);
+
+                    Rect contentRect = new Rect(
+                        scrollPanelRect.xMin,
+                        scrollPanelRect.yMin,
+                        scrollPanelRect.width - 20,
+                        mMessageDesiredHeight);
+
+                    mScroll = GUI.BeginScrollView(scrollPanelRect, mScroll, contentRect);
+
+                    GUI.Label(contentRect, mMessage, UnityStyles.Dialog.MessageText);
+
+                    GUI.EndScrollView();
+                }
+            }
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoFirstButton();
+                    DoSecondButton();
+                    DoThirdButton();
+                    return;
+                }
+
+                DoThirdButton();
+                DoSecondButton();
+                DoFirstButton();
+            }
+        }
+
+        void DoFirstButton()
+        {
+            GUI.enabled = mIsFirstButtonEnabled;
+
+            bool pressed = mIsFirstButtonEnabled ?
+                AcceptButton(mFirst) :
+                NormalButton(mFirst);
+
+            GUI.enabled = true;
+
+            if (!pressed)
+                return;
+
+            OkButtonAction();
+        }
+
+        void DoSecondButton()
+        {
+            if (!NormalButton(mSecond))
+                return;
+
+            CancelButtonAction();
+        }
+
+        void DoThirdButton()
+        {
+            if (mThird == null)
+                return;
+
+            bool pressed = mIsFirstButtonEnabled ?
+                NormalButton(mThird) :
+                AcceptButton(mThird);
+
+            if (!pressed)
+                return;
+
+            ApplyButtonAction();
+        }
+
+        static PlasticQuestionAlert Create(
+            string title, string message, string first,
+            string second, string third, bool isFirstButtonEnabled,
+            GuiMessage.GuiMessageType alertType)
+        {
+            var instance = CreateInstance<PlasticQuestionAlert>();
+            instance.titleContent = new GUIContent(title);
+            instance.mTitle = title;
+            instance.mMessage = message;
+            instance.mFirst = first;
+            instance.mSecond = second;
+            instance.mThird = third;
+            instance.mIsFirstButtonEnabled = isFirstButtonEnabled;
+            instance.mAlertType = alertType;
+            instance.mEnterKeyAction = GetEnterKeyAction(isFirstButtonEnabled, instance);
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            return instance;
+        }
+
+        static Action GetEnterKeyAction(
+            bool isFirstButtonEnabled,
+            PlasticQuestionAlert instance)
+        {
+            if (isFirstButtonEnabled)
+                return instance.OkButtonAction;
+
+            return instance.ApplyButtonAction;
+        }
+
+        string mTitle;
+        string mMessage, mFirst, mSecond, mThird;
+        bool mIsFirstButtonEnabled;
+        GuiMessage.GuiMessageType mAlertType;
+
+        Vector2 mScroll;
+        float mMessageDesiredHeight;
+        float mMessageViewHeight;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Message/PlasticQuestionAlert.cs.meta b/Editor/PlasticSCM/UI/Message/PlasticQuestionAlert.cs.meta
new file mode 100644
index 0000000..a3b72dc
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Message/PlasticQuestionAlert.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: b835f3512ad594c8587c02ae715fc919
+timeCreated: 1541005984
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/PlasticDialog.cs b/Editor/PlasticSCM/UI/PlasticDialog.cs
new file mode 100644
index 0000000..6c5a40a
--- /dev/null
+++ b/Editor/PlasticSCM/UI/PlasticDialog.cs
@@ -0,0 +1,428 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    [InitializeOnLoad]
+    internal abstract class PlasticDialog : EditorWindow, IPlasticDialogCloser
+    {
+        protected virtual Rect DefaultRect
+        {
+            get
+            {
+                int pixelWidth = Screen.currentResolution.width;
+                float x = (pixelWidth - DEFAULT_WIDTH) / 2;
+                return new Rect(x, 200, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+            }
+        }
+
+        protected virtual bool IsResizable { get; set; }
+
+        internal void OkButtonAction()
+        {
+            CompleteModal(ResponseType.Ok);
+        }
+
+        internal void CancelButtonAction()
+        {
+            CompleteModal(ResponseType.Cancel);
+        }
+
+        internal void CloseButtonAction()
+        {
+            CompleteModal(ResponseType.None);
+        }
+
+        internal void ApplyButtonAction()
+        {
+            CompleteModal(ResponseType.Apply);
+        }
+
+        internal ResponseType RunModal(EditorWindow parentWindow)
+        {
+            InitializeVars(parentWindow);
+
+            if (!IsResizable)
+                MakeNonResizable();
+
+            if (UI.RunModal.IsAvailable())
+            {
+                UI.RunModal.Dialog(this);
+                return mAnswer;
+            }
+
+            EditorUtility.DisplayDialog(
+                PlasticLocalization.GetString(PlasticLocalization.Name.PlasticSCM),
+                PlasticLocalization.GetString(PlasticLocalization.Name.PluginModalInformation),
+                PlasticLocalization.GetString(PlasticLocalization.Name.CloseButton));
+            return ResponseType.None;
+        }
+
+        protected void OnGUI()
+        {
+            try
+            {
+                // If the Dialog has been saved into the Unity editor layout and persisted between restarts, the methods
+                // to configure the dialogs will be skipped. Simple fix here is to close it when this state is detected.
+                // Fixes a NPE loop when the state mentioned above is occuring.
+                if (!mIsConfigured)
+                {
+                    mIsClosed = true;
+                    Close();
+                    return;
+                }
+
+                if (Event.current.type == EventType.Layout)
+                {
+                    EditorDispatcher.Update();
+                }
+
+                if (!mFocusedOnce)
+                {
+                    // Somehow the prevents the dialog from jumping when dragged
+                    // NOTE(rafa): We cannot do every frame because the modal kidnaps focus for all processes (in mac at least)
+                    Focus();
+                    mFocusedOnce = true;
+                }
+
+                ProcessKeyActions();
+
+                if (mIsClosed)
+                    return;
+
+                GUI.Box(new Rect(0, 0, position.width, position.height), GUIContent.none, EditorStyles.label);
+
+                float margin = 25;
+                float marginTop = 25;
+                using (new EditorGUILayout.HorizontalScope(GUILayout.Height(position.height)))
+                {
+                    GUILayout.Space(margin);
+                    using (new EditorGUILayout.VerticalScope(GUILayout.Height(position.height)))
+                    {
+                        GUILayout.Space(marginTop);
+                        OnModalGUI();
+                        GUILayout.Space(margin);
+                    }
+                    GUILayout.Space(margin);
+                }
+
+                var lastRect = GUILayoutUtility.GetLastRect();
+                float desiredHeight = lastRect.yMax;
+                Rect newPos = position;
+                newPos.height = desiredHeight;
+                if (position.height < desiredHeight)
+                    position = newPos;
+
+                if (Event.current.type == EventType.Repaint)
+                {
+                    if (mIsCompleted)
+                    {
+                        mIsClosed = true;
+                        Close();
+                    }
+                }
+            }
+            finally
+            {
+                if (mIsClosed)
+                    EditorGUIUtility.ExitGUI();
+            }
+        }
+
+        void OnDestroy()
+        {
+            if (!mIsConfigured)
+                return;
+
+            SaveSettings();
+            mParentWindow.Focus();
+        }
+
+        protected virtual void SaveSettings() { }
+        protected abstract void OnModalGUI();
+        protected abstract string GetTitle();
+
+        protected void Paragraph(string text)
+        {
+            GUILayout.Label(text, UnityStyles.Paragraph);
+            GUILayout.Space(DEFAULT_PARAGRAPH_SPACING);
+        }
+
+        protected void TextBlockWithEndLink(
+            string url, string formattedExplanation,
+            GUIStyle textblockStyle)
+        {
+            string explanation = string.Format(
+                formattedExplanation, "");
+
+            GUILayout.Label(explanation, textblockStyle);
+
+            if (explanation == formattedExplanation)
+                return;
+
+            string coloredUrl = string.Format(
+                "<color=\"{0}\">{1}</color>",
+                UnityStyles.HexColors.LINK_COLOR,
+                url);
+
+            float linkWidth =
+                textblockStyle.CalcSize(new GUIContent(url)).x;
+
+            if (GUILayout.Button(coloredUrl, textblockStyle, GUILayout.Width(linkWidth)))
+                Application.OpenURL(url);
+
+            EditorGUIUtility.AddCursorRect(
+                GUILayoutUtility.GetLastRect(), MouseCursor.Link);
+        }
+
+        protected static void Title(string text)
+        {
+            GUILayout.Label(text, UnityStyles.Dialog.Toggle);
+        }
+
+        protected static bool TitleToggle(string text, bool isOn)
+        {
+            return EditorGUILayout.ToggleLeft(text, isOn, UnityStyles.Dialog.Toggle);
+        }
+
+        protected static bool TitleToggle(string text, bool isOn, GUIStyle style)
+        {
+            return EditorGUILayout.ToggleLeft(text, isOn, style);
+        }
+
+        protected static string TextEntry(
+            string label,
+            string value,
+            float width,
+            float x)
+        {
+            return TextEntry(
+                label,
+                value,
+                null,
+                width,
+                x);
+        }
+
+        protected static string TextEntry(
+            string label, string value, string controlName, float width, float x)
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                EntryLabel(label);
+
+                GUILayout.FlexibleSpace();
+
+                var rt = GUILayoutUtility.GetRect(
+                    new GUIContent(value), UnityStyles.Dialog.EntryLabel);
+                rt.width = width;
+                rt.x = x;
+
+                if (!string.IsNullOrEmpty(controlName))
+                    GUI.SetNextControlName(controlName);
+
+                return GUI.TextField(rt, value);
+            }
+        }
+
+        protected static string ComboBox(
+            string label,
+            string value,
+            string controlName,
+            List<string> dropDownOptions,
+            GenericMenu.MenuFunction2 optionSelected,
+            float width,
+            float x)
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                EntryLabel(label);
+
+                GUILayout.FlexibleSpace();
+
+                var rt = GUILayoutUtility.GetRect(
+                    new GUIContent(value), UnityStyles.Dialog.EntryLabel);
+                rt.width = width;
+                rt.x = x;
+
+                return DropDownTextField.DoDropDownTextField(
+                    value,
+                    label,
+                    dropDownOptions,
+                    optionSelected,
+                    rt);
+            }
+        }
+
+        protected static string PasswordEntry(
+            string label, string value, float width, float x)
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                EntryLabel(label);
+
+                GUILayout.FlexibleSpace();
+
+                var rt = GUILayoutUtility.GetRect(
+                    new GUIContent(value), UnityStyles.Dialog.EntryLabel);
+                rt.width = width;
+                rt.x = x;
+
+                return GUI.PasswordField(rt, value, '*');
+            }
+        }
+
+        protected static bool ToggleEntry(
+            string label, bool value, float width, float x)
+        {
+            var rt = GUILayoutUtility.GetRect(
+                new GUIContent(label), UnityStyles.Dialog.EntryLabel);
+            rt.width = width;
+            rt.x = x;
+
+            return GUI.Toggle(rt, value, label);
+        }
+
+        protected static bool NormalButton(string text)
+        {
+            return GUILayout.Button(
+                text, UnityStyles.Dialog.NormalButton,
+                GUILayout.MinWidth(80),
+                GUILayout.Height(25));
+        }
+
+        void IPlasticDialogCloser.CloseDialog()
+        {
+            OkButtonAction();
+        }
+
+        void ProcessKeyActions()
+        {
+            Event e = Event.current;
+
+            if (mEnterKeyAction != null &&
+                Keyboard.IsReturnOrEnterKeyPressed(e))
+            {
+                mEnterKeyAction.Invoke();
+                e.Use();
+                return;
+            }
+
+            if (mEscapeKeyAction != null &&
+                Keyboard.IsKeyPressed(e, KeyCode.Escape))
+            {
+                mEscapeKeyAction.Invoke();
+                e.Use();
+                return;
+            }
+        }
+
+        protected static bool AcceptButton(string text)
+        {
+            GUI.color = new Color(0.098f, 0.502f, 0.965f, .8f);
+
+            int textWidth = (int)((GUIStyle)UnityStyles.Dialog.AcceptButtonText)
+                .CalcSize(new GUIContent(text)).x;
+
+            bool pressed = GUILayout.Button(
+                string.Empty, GetEditorSkin().button,
+                GUILayout.MinWidth(Math.Max(80, textWidth + 10)),
+                GUILayout.Height(25));
+
+            GUI.color = Color.white;
+
+            Rect buttonRect = GUILayoutUtility.GetLastRect();
+            GUI.Label(buttonRect, text, UnityStyles.Dialog.AcceptButtonText);
+
+            return pressed;
+        }
+
+        void CompleteModal(ResponseType answer)
+        {
+            mIsCompleted = true;
+            mAnswer = answer;
+        }
+
+        void InitializeVars(EditorWindow parentWindow)
+        {
+            mIsConfigured = true;
+            mIsCompleted = false;
+            mIsClosed = false;
+            mAnswer = ResponseType.Cancel;
+
+            titleContent = new GUIContent(GetTitle());
+
+            mFocusedOnce = false;
+
+            position = DefaultRect;
+            mParentWindow = parentWindow;
+        }
+
+        void MakeNonResizable()
+        {
+            maxSize = DefaultRect.size;
+            minSize = maxSize;
+        }
+
+        static void EntryLabel(string labelText)
+        {
+            GUIContent labelContent = new GUIContent(labelText);
+            GUIStyle labelStyle = UnityStyles.Dialog.EntryLabel;
+
+            Rect rt = GUILayoutUtility.GetRect(labelContent, labelStyle);
+
+            GUI.Label(rt, labelText, EditorStyles.label);
+        }
+
+        static GUISkin GetEditorSkin()
+        {
+            return EditorGUIUtility.isProSkin ?
+                EditorGUIUtility.GetBuiltinSkin(EditorSkin.Scene) :
+                EditorGUIUtility.GetBuiltinSkin(EditorSkin.Inspector);
+        }
+
+        bool mIsConfigured;
+        bool mIsCompleted;
+        bool mIsClosed;
+        ResponseType mAnswer;
+
+        protected Action mEnterKeyAction = null;
+        protected Action mEscapeKeyAction = null;
+
+        bool mFocusedOnce;
+
+        Dictionary<string, string[]> mWrappedTextLines =
+            new Dictionary<string, string[]>();
+
+        EditorWindow mParentWindow;
+
+        protected const float DEFAULT_LINE_SPACING = -5;
+        const float DEFAULT_WIDTH = 500;
+        const float DEFAULT_HEIGHT = 180;
+        const float DEFAULT_PARAGRAPH_SPACING = 10f;
+
+        static class BuildLine
+        {
+            internal static string ForIndex(string text, int index)
+            {
+                if (index < 0 || index > text.Length)
+                    return string.Empty;
+
+                return text.Substring(index).Trim();
+            }
+
+            internal static string ForIndexAndLenght(string text, int index, int lenght)
+            {
+                if (index < 0 || index > text.Length)
+                    return string.Empty;
+
+                return text.Substring(index, lenght);
+            }
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/PlasticDialog.cs.meta b/Editor/PlasticSCM/UI/PlasticDialog.cs.meta
new file mode 100644
index 0000000..2c0491d
--- /dev/null
+++ b/Editor/PlasticSCM/UI/PlasticDialog.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: ac908610ab768459d9be962750408b43
+timeCreated: 1541414966
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/PlasticSplitterGUILayout.cs b/Editor/PlasticSCM/UI/PlasticSplitterGUILayout.cs
new file mode 100644
index 0000000..848a9de
--- /dev/null
+++ b/Editor/PlasticSCM/UI/PlasticSplitterGUILayout.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Reflection;
+
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class PlasticSplitterGUILayout
+    {
+        internal static void BeginHorizontalSplit(object splitterState)
+        {
+            InternalBeginHorizontalSplit.Invoke(
+                null, new object[] {splitterState, new GUILayoutOption[] { }});
+        }
+
+        internal static void EndHorizontalSplit()
+        {
+            InternalEndHorizontalSplit.Invoke(
+                null, new object[] { });
+        }
+
+        internal static void BeginVerticalSplit(object splitterState)
+        {
+            InternalBeginVerticalSplit.Invoke(
+                null, new object[] {splitterState, new GUILayoutOption[] { }});
+        }
+
+        internal static void EndVerticalSplit()
+        {
+            InternalEndVerticalSplit.Invoke(
+                null, new object[] { });
+        }
+
+        internal static object InitSplitterState(
+            float[] relativeSizes, int[] minSizes, int[] maxSizes)
+        {
+            ConstructorInfo ctorInfo = SplitterState.GetConstructor(
+                new Type[] {typeof(float[]), typeof(int[]), typeof(int[])});
+
+            return ctorInfo.Invoke(
+                new object[] {relativeSizes, minSizes, maxSizes});
+        }
+
+        static readonly Type SplitterState =
+            typeof(UnityEditor.Editor).Assembly.
+                GetType("UnityEditor.SplitterState");
+        static readonly Type InternalSplitterGUILayout =
+            typeof(UnityEditor.Editor).Assembly.
+                GetType("UnityEditor.SplitterGUILayout");
+
+        static readonly MethodInfo InternalBeginHorizontalSplit =
+            InternalSplitterGUILayout.GetMethod(
+                "BeginHorizontalSplit",
+                new Type[] { SplitterState, typeof(GUILayoutOption[]) });
+        static readonly MethodInfo InternalEndHorizontalSplit =
+            InternalSplitterGUILayout.GetMethod("EndHorizontalSplit");
+
+        static readonly MethodInfo InternalBeginVerticalSplit =
+            InternalSplitterGUILayout.GetMethod(
+                "BeginVerticalSplit",
+                new Type[] { SplitterState, typeof(GUILayoutOption[]) });
+        static readonly MethodInfo InternalEndVerticalSplit =
+            InternalSplitterGUILayout.GetMethod("EndVerticalSplit");
+    }
+}
diff --git a/Editor/PlasticSCM/UI/PlasticSplitterGUILayout.cs.meta b/Editor/PlasticSCM/UI/PlasticSplitterGUILayout.cs.meta
new file mode 100644
index 0000000..d585f54
--- /dev/null
+++ b/Editor/PlasticSCM/UI/PlasticSplitterGUILayout.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: aaa080d8f7504a868c0c980890f9d5fd
+timeCreated: 1590087409
\ No newline at end of file
diff --git a/Editor/PlasticSCM/UI/Progress.meta b/Editor/PlasticSCM/UI/Progress.meta
new file mode 100644
index 0000000..ace380b
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: be4a999efc9d629458e92bbcbe233d1d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Progress/DrawProgressForDialogs.cs b/Editor/PlasticSCM/UI/Progress/DrawProgressForDialogs.cs
new file mode 100644
index 0000000..7a00eef
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/DrawProgressForDialogs.cs
@@ -0,0 +1,38 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI.Progress
+{
+    internal static class DrawProgressForDialogs
+    {
+        internal static void For(ProgressControlsForDialogs.Data data)
+        {
+            Rect rect = GUILayoutUtility.GetRect(
+                GUILayoutUtility.GetLastRect().width, 30);
+
+            if (!string.IsNullOrEmpty(data.StatusMessage))
+            {
+                EditorGUI.HelpBox(rect, data.StatusMessage, data.StatusType);
+                return;
+            }
+
+            if (data.IsWaitingAsyncResult)
+                DoProgressBar(rect, data.ProgressMessage, data.ProgressPercent);
+        }
+
+        static void DoProgressBar(
+            Rect rect,
+            string progressMessage,
+            float progressPercent)
+        {
+            Rect messageRect = new Rect(
+                rect.xMin, rect.yMin + 2, rect.width, 16);
+            Rect progresRect = new Rect(
+                rect.xMin, rect.yMin + 20, rect.width, 6);
+
+            GUI.Label(messageRect, progressMessage);
+
+            EditorGUI.ProgressBar(progresRect, progressPercent, string.Empty);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Progress/DrawProgressForDialogs.cs.meta b/Editor/PlasticSCM/UI/Progress/DrawProgressForDialogs.cs.meta
new file mode 100644
index 0000000..6b7ddc6
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/DrawProgressForDialogs.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5c32dc56ff6d08947a329b5c4789c728
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Progress/DrawProgressForOperations.cs b/Editor/PlasticSCM/UI/Progress/DrawProgressForOperations.cs
new file mode 100644
index 0000000..679860e
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/DrawProgressForOperations.cs
@@ -0,0 +1,77 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI.Progress
+{
+    internal static class DrawProgressForOperations
+    {
+        internal static void For(
+            PlasticGUIClient plasticClient,
+            OperationProgressData operationProgressData,
+            float width)
+        {
+            EditorGUILayout.BeginVertical(
+                EditorStyles.helpBox, GUILayout.Height(60));
+
+            GUILayout.Label(
+                operationProgressData.ProgressHeader ?? string.Empty,
+                EditorStyles.miniLabel);
+
+            DoProgressBar(
+                operationProgressData.TotalProgressMessage,
+                (float)operationProgressData.TotalProgressPercent,
+                operationProgressData.CanCancelProgress, width);
+
+            if (operationProgressData.CanCancelProgress)
+                DoCancelButton(plasticClient);
+
+            if (operationProgressData.ShowCurrentBlock)
+            {
+                GUILayout.Space(6);
+                DoProgressBar(
+                    operationProgressData.CurrentBlockProgressMessage,
+                    (float)operationProgressData.CurrentBlockProgressPercent,
+                    operationProgressData.CanCancelProgress, width);
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static void DoProgressBar(
+            string message,
+            float progressPercent,
+            bool canCancel,
+            float width)
+        {
+            Rect progressRect = GUILayoutUtility.GetRect(width, 15);
+
+            if (canCancel)
+                progressRect.width -= UnityConstants.CANCEL_BUTTON_SIZE + 2;
+
+            EditorGUI.ProgressBar(progressRect, progressPercent, string.Empty);
+
+            progressRect.xMin += 4;
+
+            GUI.Label(progressRect, message, EditorStyles.miniLabel);
+        }
+
+        static void DoCancelButton(
+            PlasticGUIClient plasticClient)
+        {
+            Rect beginRect = GUILayoutUtility.GetLastRect();
+            Rect endRect = GUILayoutUtility.GetLastRect();
+
+            float freeVerticalSpace = endRect.yMax - beginRect.yMin;
+
+            Rect cancelButtonRect = new Rect(
+                endRect.xMax - UnityConstants.CANCEL_BUTTON_SIZE + 1,
+                beginRect.yMin + (freeVerticalSpace - UnityConstants.CANCEL_BUTTON_SIZE) / 2,
+                UnityConstants.CANCEL_BUTTON_SIZE, UnityConstants.CANCEL_BUTTON_SIZE);
+
+            if (!GUI.Button(cancelButtonRect, GUIContent.none, UnityStyles.CancelButton))
+                return;
+
+            plasticClient.CancelCurrentOperation();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Progress/DrawProgressForOperations.cs.meta b/Editor/PlasticSCM/UI/Progress/DrawProgressForOperations.cs.meta
new file mode 100644
index 0000000..2e7e2d3
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/DrawProgressForOperations.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa1cd36edf652db46b5fa11c2ed355b9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Progress/DrawProgressForViews.cs b/Editor/PlasticSCM/UI/Progress/DrawProgressForViews.cs
new file mode 100644
index 0000000..5a0a74a
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/DrawProgressForViews.cs
@@ -0,0 +1,66 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI.Progress
+{
+    internal static class DrawProgressForViews
+    {
+        internal static void ForNotificationArea(
+            ProgressControlsForViews.Data data)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            EditorGUILayout.HelpBox(
+                data.NotificationMessage,
+                data.NotificationType);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        internal static void ForIndeterminateProgress(
+            ProgressControlsForViews.Data data)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            GUILayout.Space(10);
+
+            DoProgressBar(data.ProgressPercent);
+
+            GUILayout.Space(3);
+
+            DoProgressLabel(data.ProgressMessage);
+
+            GUILayout.FlexibleSpace();
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoProgressBar(float progressPercent)
+        {
+            EditorGUILayout.BeginVertical();
+
+            GUILayout.FlexibleSpace();
+
+            Rect progressRect = GUILayoutUtility.GetRect(30, 10);
+
+            EditorGUI.ProgressBar(progressRect, progressPercent, string.Empty);
+
+            GUILayout.FlexibleSpace();
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static void DoProgressLabel(string progressMessage)
+        {
+            EditorGUILayout.BeginVertical();
+
+            GUILayout.FlexibleSpace();
+
+            GUILayout.Label(progressMessage, UnityStyles.ProgressLabel);
+
+            GUILayout.FlexibleSpace();
+
+            EditorGUILayout.EndVertical();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Progress/DrawProgressForViews.cs.meta b/Editor/PlasticSCM/UI/Progress/DrawProgressForViews.cs.meta
new file mode 100644
index 0000000..d352858
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/DrawProgressForViews.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ab0090fd6aa8c604a828244d4ba93c84
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Progress/OperationProgressData.cs b/Editor/PlasticSCM/UI/Progress/OperationProgressData.cs
new file mode 100644
index 0000000..585ed0b
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/OperationProgressData.cs
@@ -0,0 +1,155 @@
+namespace Unity.PlasticSCM.Editor.UI.Progress
+{
+    internal class OperationProgressData
+    {
+        internal string ProgressHeader
+        {
+            get
+            {
+                lock (mLockGuard)
+                {
+                    return mProgressHeader;
+                }
+            }
+            set
+            {
+                lock (mLockGuard)
+                {
+                    mProgressHeader = value;
+                }
+            }
+        }
+
+        internal string TotalProgressMessage
+        {
+            get
+            {
+                lock (mLockGuard)
+                {
+                    return mTotalProgressMessage;
+                }
+            }
+            set
+            {
+                lock (mLockGuard)
+                {
+                    mTotalProgressMessage = value;
+                }
+            }
+        }
+
+        internal string CurrentBlockProgressMessage
+        {
+            get
+            {
+                lock (mLockGuard)
+                {
+                    return mBlockProgressMessage;
+                }
+            }
+            set
+            {
+                lock (mLockGuard)
+                {
+                    mBlockProgressMessage = value;
+                }
+            }
+        }
+
+        internal double TotalProgressPercent
+        {
+            get
+            {
+                lock (mLockGuard)
+                {
+                    return mTotalProgressPercent;
+                }
+            }
+            set
+            {
+                lock (mLockGuard)
+                {
+                    mTotalProgressPercent = value;
+                }
+            }
+        }
+
+        internal double CurrentBlockProgressPercent
+        {
+            get
+            {
+                lock (mLockGuard)
+                {
+                    return mBlockProgressPercent;
+                }
+            }
+            set
+            {
+                lock (mLockGuard)
+                {
+                    mBlockProgressPercent = value;
+                }
+            }
+        }
+
+        internal bool ShowCurrentBlock
+        {
+            get
+            {
+                lock (mLockGuard)
+                {
+                    return mShowCurrentBlock;
+                }
+            }
+            set
+            {
+                lock (mLockGuard)
+                {
+                    mShowCurrentBlock = value;
+                }
+            }
+        }
+
+        internal bool CanCancelProgress
+        {
+            get
+            {
+                lock (mLockGuard)
+                {
+                    return mCanCancelProgress;
+                }
+            }
+            set
+            {
+                lock (mLockGuard)
+                {
+                    mCanCancelProgress = value;
+                }
+            }
+        }
+
+        internal void ResetProgress()
+        {
+            lock (mLockGuard)
+            {
+                mProgressHeader = string.Empty;
+                mTotalProgressMessage = string.Empty;
+                mBlockProgressMessage = string.Empty;
+                mTotalProgressPercent = 0;
+                mBlockProgressPercent = 0;
+                mShowCurrentBlock = false;
+                mCanCancelProgress = false;
+            }
+        }
+
+        string mProgressHeader;
+        string mTotalProgressMessage;
+        string mBlockProgressMessage;
+        double mTotalProgressPercent;
+        double mBlockProgressPercent;
+        bool mShowCurrentBlock;
+        bool mCanCancelProgress;
+
+        object mLockGuard = new object();
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Progress/OperationProgressData.cs.meta b/Editor/PlasticSCM/UI/Progress/OperationProgressData.cs.meta
new file mode 100644
index 0000000..a1902ff
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/OperationProgressData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3e858d866b71d5245b9b869476a487f1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Progress/ProgressControlsForDialogs.cs b/Editor/PlasticSCM/UI/Progress/ProgressControlsForDialogs.cs
new file mode 100644
index 0000000..25fe3ef
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/ProgressControlsForDialogs.cs
@@ -0,0 +1,116 @@
+using System;
+
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.UI.Progress
+{
+    internal class ProgressControlsForDialogs : IProgressControls
+    {
+        internal class Data
+        {
+            internal bool IsWaitingAsyncResult;
+            internal float ProgressPercent;
+            internal string ProgressMessage;
+
+            internal MessageType StatusType;
+            internal string StatusMessage;
+
+            internal void CopyInto(Data other)
+            {
+                other.IsWaitingAsyncResult = IsWaitingAsyncResult;
+                other.ProgressPercent = ProgressPercent;
+                other.ProgressMessage = ProgressMessage;
+                other.StatusType = StatusType;
+                other.StatusMessage = StatusMessage;
+            }
+        }
+
+        internal Data ProgressData { get { return mData; } }
+
+        internal void ForcedUpdateProgress(EditorWindow dialog)
+        {
+            double updateTime;
+            float progressPercent;
+            GetUpdateProgress(
+                mLastUpdateTime, mData.ProgressPercent,
+                out updateTime, out progressPercent);
+
+            mLastUpdateTime = updateTime;
+
+            if (!mData.IsWaitingAsyncResult)
+                return;
+
+            mData.ProgressPercent = progressPercent;
+
+            if (Event.current.type == EventType.Repaint)
+                dialog.Repaint();
+        }
+
+        void IProgressControls.HideProgress()
+        {
+            mData.IsWaitingAsyncResult = false;
+            mData.ProgressMessage = string.Empty;
+        }
+
+        void IProgressControls.ShowProgress(string message)
+        {
+            CleanStatusMessage(mData);
+
+            mData.IsWaitingAsyncResult = true;
+            mData.ProgressPercent = 0f;
+            mData.ProgressMessage = message;
+        }
+
+        void IProgressControls.ShowError(string message)
+        {
+            mData.StatusMessage = message;
+            mData.StatusType = MessageType.Error;
+        }
+
+        void IProgressControls.ShowNotification(string message)
+        {
+            mData.StatusMessage = message;
+            mData.StatusType = MessageType.Info;
+        }
+
+        void IProgressControls.ShowSuccess(string message)
+        {
+            mData.StatusMessage = message;
+            mData.StatusType = MessageType.Info;
+        }
+
+        void IProgressControls.ShowWarning(string message)
+        {
+            mData.StatusMessage = message;
+            mData.StatusType = MessageType.Warning;
+        }
+
+        static void CleanStatusMessage(Data data)
+        {
+            data.StatusMessage = string.Empty;
+            data.StatusType = MessageType.None;
+        }
+
+        static void GetUpdateProgress(
+            double lastUpdateTime, float lastProgressPercent,
+            out double updateTime, out float progressPercent)
+        {
+            updateTime = EditorApplication.timeSinceStartup;
+
+            double deltaTime = Math.Min(0.1, updateTime - lastUpdateTime);
+            double deltaPercent = (deltaTime / 0.1) * PERCENT_PER_SECONDS;
+
+            progressPercent = Mathf.Repeat(
+                lastProgressPercent + (float)deltaPercent, 1f);
+        }
+
+        double mLastUpdateTime = 0.0;
+
+        Data mData = new Data();
+
+        const double PERCENT_PER_SECONDS = 0.06;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Progress/ProgressControlsForDialogs.cs.meta b/Editor/PlasticSCM/UI/Progress/ProgressControlsForDialogs.cs.meta
new file mode 100644
index 0000000..8b92e1f
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/ProgressControlsForDialogs.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa3f399d17e1dcf4c9e417ffce5eb905
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Progress/ProgressControlsForViews.cs b/Editor/PlasticSCM/UI/Progress/ProgressControlsForViews.cs
new file mode 100644
index 0000000..6c88ab1
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/ProgressControlsForViews.cs
@@ -0,0 +1,138 @@
+using UnityEditor;
+
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.UI.Progress
+{
+    internal class ProgressControlsForViews : IProgressControls
+    {
+        internal class Data
+        {
+            internal bool IsOperationRunning;
+            internal float ProgressPercent;
+            internal string ProgressMessage;
+
+            internal MessageType NotificationType;
+            internal string NotificationMessage;
+
+            internal void CopyInto(Data other)
+            {
+                other.IsOperationRunning = IsOperationRunning;
+                other.ProgressPercent = ProgressPercent;
+                other.ProgressMessage = ProgressMessage;
+                other.NotificationType = NotificationType;
+                other.NotificationMessage = NotificationMessage;
+            }
+        }
+
+        internal Data ProgressData { get { return mData; } }
+
+        internal bool IsOperationRunning()
+        {
+            return mData.IsOperationRunning;
+        }
+
+        internal bool HasNotification()
+        {
+            return !string.IsNullOrEmpty(mData.NotificationMessage);
+        }
+
+        internal void UpdateDeterminateProgress(EditorWindow parentWindow)
+        {
+            if (IsOperationRunning() || mRequestedRepaint)
+            {
+                parentWindow.Repaint();
+
+                mRequestedRepaint = false;
+            }
+        }
+
+        internal void UpdateProgress(EditorWindow parentWindow)
+        {
+            if (IsOperationRunning() || mRequestedRepaint)
+            {
+                if (IsOperationRunning())
+                    UpdateIndeterminateProgress();
+
+                parentWindow.Repaint();
+
+                mRequestedRepaint = false;
+            }
+        }
+
+        void IProgressControls.HideProgress()
+        {
+            HideNotification();
+
+            mData.IsOperationRunning = false;
+            mData.ProgressMessage = string.Empty;
+
+            mRequestedRepaint = true;
+        }
+
+        void IProgressControls.ShowProgress(string message)
+        {
+            HideNotification();
+
+            mData.IsOperationRunning = true;
+            mData.ProgressMessage = message;
+
+            mRequestedRepaint = true;
+        }
+
+        void IProgressControls.ShowError(string message)
+        {
+            mData.NotificationMessage = message;
+            mData.NotificationType = MessageType.Error;
+
+            mRequestedRepaint = true;
+        }
+
+        void IProgressControls.ShowNotification(string message)
+        {
+            mData.NotificationMessage = message;
+            mData.NotificationType = MessageType.Info;
+
+            mRequestedRepaint = true;
+        }
+
+        void IProgressControls.ShowSuccess(string message)
+        {
+            mData.NotificationMessage = message;
+            mData.NotificationType = MessageType.Info;
+
+            mRequestedRepaint = true;
+        }
+
+        void IProgressControls.ShowWarning(string message)
+        {
+            mData.NotificationMessage = message;
+            mData.NotificationType = MessageType.Warning;
+
+            mRequestedRepaint = true;
+        }
+
+        void HideNotification()
+        {
+            mData.NotificationMessage = string.Empty;
+            mData.NotificationType = MessageType.None;
+
+            mRequestedRepaint = true;
+        }
+
+        void UpdateIndeterminateProgress()
+        {
+            // NOTE(rafa): there is no support for indeterminate progress bar
+            // i use this neverending progress bar as workaround
+
+            mData.ProgressPercent += .003f;
+
+            if (mData.ProgressPercent > 1f)
+                mData.ProgressPercent = .1f;
+        }
+
+        Data mData = new Data();
+
+        bool mRequestedRepaint;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Progress/ProgressControlsForViews.cs.meta b/Editor/PlasticSCM/UI/Progress/ProgressControlsForViews.cs.meta
new file mode 100644
index 0000000..1699c4a
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Progress/ProgressControlsForViews.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2837297e95f28c44eb67b93417fce9d0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/ResponseType.cs b/Editor/PlasticSCM/UI/ResponseType.cs
new file mode 100644
index 0000000..deaf738
--- /dev/null
+++ b/Editor/PlasticSCM/UI/ResponseType.cs
@@ -0,0 +1,10 @@
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal enum ResponseType
+    {
+        None,
+        Ok,
+        Cancel,
+        Apply
+    }
+}
diff --git a/Editor/PlasticSCM/UI/ResponseType.cs.meta b/Editor/PlasticSCM/UI/ResponseType.cs.meta
new file mode 100644
index 0000000..0f7f0a4
--- /dev/null
+++ b/Editor/PlasticSCM/UI/ResponseType.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ba319c71501487041bda92a854e8435e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/RunModal.cs b/Editor/PlasticSCM/UI/RunModal.cs
new file mode 100644
index 0000000..bc35ff2
--- /dev/null
+++ b/Editor/PlasticSCM/UI/RunModal.cs
@@ -0,0 +1,233 @@
+using System;
+using System.Reflection;
+
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    [InitializeOnLoad]
+    internal static class RunModal
+    {
+        static RunModal()
+        {
+            InitializeInfo();
+        }
+
+        internal static bool IsAvailable()
+        {
+            return mShowWithModeMethod != null
+                && mCreateSavedGUIState != null
+                && mApplyAndForgetMethod != null
+                && mParentField != null
+                && mParentWindowProp != null
+                && mMakeModalMethod != null;
+        }
+
+        internal static void Dialog(EditorWindow window)
+        {
+            ShowAsUtility(window);
+
+            object savedGUIState = CreateSavedGUIState();
+            PushDispatcherContext(window);
+
+            MakeModal(window);
+
+            PopDispatcherContext(window);
+            ApplySavedGUIState(savedGUIState);
+        }
+
+        static void MakeModal(EditorWindow window)
+        {
+            // MakeModal(m_Parent.window);
+            var hostView = mParentField.GetValue(window);
+            var parentWindow = mParentWindowProp.GetValue(hostView, null);
+
+            mMakeModalMethod.Invoke(
+                mMakeModalMethod.IsStatic ? null : window,
+                new object[] { parentWindow });
+        }
+
+        static void ShowAsUtility(EditorWindow window)
+        {
+            // ShowWithMode(ShowMode.Utility);
+            mShowWithModeMethod.Invoke(window, new object[] { 2 });
+        }
+
+        static object CreateSavedGUIState()
+        {
+            // SavedGUIState guiState = SavedGUIState.Create();
+            return mCreateSavedGUIState.Invoke(null, null);
+        }
+
+        static void ApplySavedGUIState(object savedGUIState)
+        {
+            // guiState.ApplyAndForget();
+            mApplyAndForgetMethod.Invoke(savedGUIState, null);
+        }
+
+        static void PopDispatcherContext(EditorWindow window)
+        {
+#if UNITY_2020_1_OR_NEWER
+            //UnityEngine.UIElements.EventDispatcher.editorDispatcher.PopDispatcherContext();
+
+            object editorDispatcher = mEditorDispatcherProp2020.GetValue(null);
+            mPopContextMethod2020.Invoke(editorDispatcher, null);
+#else
+            // m_Parent.visualTree.panel.dispatcher?.PopDispatcherContext();
+
+            object dispatcher = GetDispatcher(window);
+
+            if (dispatcher != null)
+                mPopContextMethod.Invoke(dispatcher, null);
+#endif
+        }
+
+        static void PushDispatcherContext(EditorWindow window)
+        {
+#if UNITY_2020_1_OR_NEWER
+            //UnityEngine.UIElements.EventDispatcher.editorDispatcher.PushDispatcherContext();
+
+            object editorDispatcher = mEditorDispatcherProp2020.GetValue(null);
+            mPushContextMethod2020.Invoke(editorDispatcher, null);
+#else
+            // m_Parent.visualTree.panel.dispatcher?.PushDispatcherContext();
+
+            object dispatcher = GetDispatcher(window);
+
+            if (dispatcher != null)
+                mPushContextMethod.Invoke(dispatcher, null);
+#endif
+        }
+
+        static object GetDispatcher(EditorWindow window)
+        {
+            object dispatcher = null;
+            if (MayHaveDispatcher())
+            {
+                var parent = mParentField.GetValue(window);
+                if (parent != null)
+                {
+                    var visualTree = mVisualTreeProp.GetValue(parent, null);
+                    if (visualTree != null)
+                    {
+                        var panel = mPanelProp.GetValue(visualTree, null);
+                        if (panel != null)
+                        {
+                            dispatcher = mDispatcherProp.GetValue(panel, null);
+                        }
+                    }
+                }
+            }
+
+            return dispatcher;
+        }
+
+        static bool MayHaveDispatcher()
+        {
+            return mDispatcherType != null
+                && mPushContextMethod != null
+                && mPopContextMethod != null;
+        }
+
+        static void InitializeInfo()
+        {
+            var flags = BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public | BindingFlags.Static;
+            mMakeModalMethod = BuildMakeModalMethodInfo(flags);
+            mShowWithModeMethod = typeof(EditorWindow).GetMethod("ShowWithMode", flags);
+            mParentField = typeof(EditorWindow).GetField("m_Parent", flags);
+            var hostViewType = mParentField.FieldType;
+            mParentWindowProp = hostViewType.GetProperty("window", flags);
+
+            var savedGUIStateType = typeof(EditorWindow).Assembly.GetType("UnityEditor.SavedGUIState");
+            mCreateSavedGUIState = savedGUIStateType.GetMethod("Create", flags);
+            mApplyAndForgetMethod = savedGUIStateType.GetMethod("ApplyAndForget", flags);
+
+#if UNITY_2020_1_OR_NEWER
+            mEditorDispatcherProp2020 = typeof(UnityEngine.UIElements.EventDispatcher).GetProperty("editorDispatcher", flags);
+            mPushContextMethod2020 = mEditorDispatcherProp2020.PropertyType.GetMethod("PushDispatcherContext", flags);
+            mPopContextMethod2020 = mEditorDispatcherProp2020.PropertyType.GetMethod("PopDispatcherContext", flags);
+#endif
+            flags = BindingFlags.NonPublic
+                    | BindingFlags.Instance
+                    | BindingFlags.Public;
+
+            mParentField = typeof(EditorWindow).GetField("m_Parent", flags);
+            if (mParentField != null)
+                hostViewType = mParentField.FieldType;
+            if (hostViewType != null)
+                mVisualTreeProp = hostViewType.GetProperty("visualTree");
+            if (mVisualTreeProp != null)
+            {
+                var visualTreeType = mVisualTreeProp.PropertyType;
+                if (visualTreeType != null)
+                {
+                    mPanelProp = visualTreeType.GetProperty("panel");
+                    if (mPanelProp != null)
+                    {
+                        var panelType = mPanelProp.PropertyType;
+                        if (panelType != null)
+                        {
+                            mDispatcherProp = panelType.GetProperty("dispatcher");
+                            if (mDispatcherProp != null)
+                            {
+                                mDispatcherType = mDispatcherProp.PropertyType;
+                                if (mDispatcherType != null)
+                                {
+                                    mPushContextMethod = mDispatcherType.GetMethod("PushDispatcherContext", flags);
+                                    mPopContextMethod = mDispatcherType.GetMethod("PopDispatcherContext", flags);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        static MethodInfo BuildMakeModalMethodInfo(BindingFlags flags)
+        {
+            if (EditorVersion.IsCurrentEditorOlderThan("2019.3.10f1"))
+                return typeof(EditorWindow).GetMethod("MakeModal", flags);
+
+            return typeof(EditorWindow).GetMethod("Internal_MakeModal", flags);
+        }
+
+        static FieldInfo mParentField;
+        static PropertyInfo mParentWindowProp;
+        static MethodInfo mMakeModalMethod;
+        static MethodInfo mShowWithModeMethod;
+        static MethodInfo mCreateSavedGUIState;
+        static MethodInfo mApplyAndForgetMethod;
+        static PropertyInfo mVisualTreeProp;
+        static Type mDispatcherType;
+        static MethodInfo mPushContextMethod;
+        static MethodInfo mPopContextMethod;
+        static PropertyInfo mPanelProp;
+        static PropertyInfo mDispatcherProp;
+
+#if UNITY_2020_1_OR_NEWER
+        static PropertyInfo mEditorDispatcherProp2020;
+        static MethodInfo mPushContextMethod2020;
+        static MethodInfo mPopContextMethod2020;
+#endif
+
+        // // How ContainerWindows are visualized. Used with ContainerWindow.Show
+        // internal enum ShowMode
+        // {
+        // 	// Show as a normal window with max, min & close buttons.
+        // 	NormalWindow = 0,
+        // 	// Used for a popup menu. On mac this means light shadow and no titlebar.
+        // 	PopupMenu = 1,
+        // 	// Utility window - floats above the app. Disappears when app loses focus.
+        // 	Utility = 2,
+        // 	// Window has no shadow or decorations. Used internally for dragging stuff around.
+        // 	NoShadow = 3,
+        // 	// The Unity main window. On mac, this is the same as NormalWindow, except window doesn't have a close button.
+        // 	MainWindow = 4,
+        // 	// Aux windows. The ones that close the moment you move the mouse out of them.
+        // 	AuxWindow = 5,
+        // 	// Like PopupMenu, but without keyboard focus
+        // 	Tooltip = 6
+        // }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/RunModal.cs.meta b/Editor/PlasticSCM/UI/RunModal.cs.meta
new file mode 100644
index 0000000..46fba6c
--- /dev/null
+++ b/Editor/PlasticSCM/UI/RunModal.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 701a688f3cb0245579bf46b63d0b7134
+timeCreated: 1541064379
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/ShowWindow.cs b/Editor/PlasticSCM/UI/ShowWindow.cs
new file mode 100644
index 0000000..b216d63
--- /dev/null
+++ b/Editor/PlasticSCM/UI/ShowWindow.cs
@@ -0,0 +1,40 @@
+using System;
+
+using UnityEditor;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class ShowWindow
+    {
+        internal static PlasticWindow Plastic()
+        {
+            return ShowPlasticWindow(false);
+        }
+
+        internal static PlasticWindow PlasticAfterDownloadingProject()
+        {
+            return ShowPlasticWindow(true);
+        }
+
+        static PlasticWindow ShowPlasticWindow(bool disableCollabWhenLoaded)
+        {
+            PlasticWindow window = EditorWindow.GetWindow<PlasticWindow>(
+                UnityConstants.PLASTIC_WINDOW_TITLE,
+                true,
+                mConsoleWindowType,
+                mProjectBrowserType);
+
+            if (disableCollabWhenLoaded)
+                window.DisableCollabIfEnabledWhenLoaded();
+
+            window.SetupWindowTitle();
+
+            return window;
+        }
+
+        static Type mConsoleWindowType = typeof(EditorWindow).
+            Assembly.GetType("UnityEditor.ConsoleWindow");
+        static Type mProjectBrowserType = typeof(EditorWindow).
+            Assembly.GetType("UnityEditor.ProjectBrowser");
+    }
+}
diff --git a/Editor/PlasticSCM/UI/ShowWindow.cs.meta b/Editor/PlasticSCM/UI/ShowWindow.cs.meta
new file mode 100644
index 0000000..fd101e8
--- /dev/null
+++ b/Editor/PlasticSCM/UI/ShowWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2bdca37e8ede38949a186765fa1eefc6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/SortOrderComparer.cs b/Editor/PlasticSCM/UI/SortOrderComparer.cs
new file mode 100644
index 0000000..20f2df9
--- /dev/null
+++ b/Editor/PlasticSCM/UI/SortOrderComparer.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class SortOrderComparer<T> : IComparer<T>
+    {
+        internal SortOrderComparer(IComparer<T> comparer, bool isAscending)
+        {
+            mComparer = comparer;
+            mIsAscending = isAscending;
+        }
+
+        int IComparer<T>.Compare(T x, T y)
+        {
+            int result = mComparer.Compare(x, y);
+            return mIsAscending ? result : -result;
+        }
+
+        bool mIsAscending;
+        IComparer<T> mComparer;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/SortOrderComparer.cs.meta b/Editor/PlasticSCM/UI/SortOrderComparer.cs.meta
new file mode 100644
index 0000000..b2a6feb
--- /dev/null
+++ b/Editor/PlasticSCM/UI/SortOrderComparer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 923089d9a5486b545bfc5f70e781d4e1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/TabButton.cs b/Editor/PlasticSCM/UI/TabButton.cs
new file mode 100644
index 0000000..71ac5f5
--- /dev/null
+++ b/Editor/PlasticSCM/UI/TabButton.cs
@@ -0,0 +1,190 @@
+using System;
+
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class TabButton
+    {
+        internal bool DrawTabButton(
+            string buttonText,
+            bool wasActive,
+            float width)
+        {
+            bool isCloseButtonClicked;
+
+            return DrawClosableTabButton(
+                buttonText,
+                wasActive,
+                false,
+                width,
+                null,
+                out isCloseButtonClicked);
+        }
+
+        internal bool DrawClosableTabButton(
+            string buttonText,
+            bool wasActive,
+            bool isClosable,
+            float width,
+            Action repaintAction,
+            out bool isCloseButtonClicked)
+        {
+            isCloseButtonClicked = false;
+
+            GUIContent buttonContent = new GUIContent(buttonText);
+
+            GUIStyle buttonStyle = (wasActive) ?
+               UnityStyles.PlasticWindow.ActiveTabButton :
+               EditorStyles.toolbarButton;
+
+            Rect toggleRect = GUILayoutUtility.GetRect(
+                buttonContent, buttonStyle,
+                GUILayout.Width(width));
+
+            if (isClosable && Event.current.type == EventType.MouseMove)
+            {
+                if (mCloseButtonRect.Contains(Event.current.mousePosition))
+                {
+                    SetCloseButtonState(
+                        CloseButtonState.Hovered,
+                        repaintAction);
+                }
+                else
+                {
+                    SetCloseButtonState(
+                        CloseButtonState.Normal,
+                        repaintAction);
+                }
+            }
+
+            if (isClosable && Event.current.type == EventType.MouseDown)
+            {
+                if (mCloseButtonRect.Contains(Event.current.mousePosition))
+                {
+                    SetCloseButtonState(
+                        CloseButtonState.Clicked,
+                        repaintAction);
+                    Event.current.Use();
+                }
+            }
+
+            if (isClosable && Event.current.type == EventType.MouseUp)
+            {
+                if (mCloseButtonRect.Contains(Event.current.mousePosition))
+                {
+                    Event.current.Use();
+                    isCloseButtonClicked = true;
+                }
+
+                if (IsTabClickWithMiddleButton(toggleRect, Event.current))
+                {
+                    Event.current.Use();
+                    isCloseButtonClicked = true;
+                }
+
+                SetCloseButtonState(
+                    CloseButtonState.Normal,
+                    repaintAction);
+            }
+
+            bool isActive = GUI.Toggle(
+                toggleRect, wasActive, buttonText, buttonStyle);
+
+            if (isClosable && toggleRect.height > 1)
+            {
+                mCloseButtonRect = DrawCloseButton(
+                    toggleRect,
+                    mCloseButtonState);
+            }
+
+            if (wasActive)
+            {
+                DrawUnderline(toggleRect);
+            }
+
+            return isActive;
+        }
+
+        static Rect DrawCloseButton(
+            Rect toggleRect,
+            CloseButtonState state)
+        {
+            int closeButtonSize = 15;
+
+            GUIContent closeImage = new GUIContent(GetCloseImage(state));
+
+            Rect closeTabRect = new Rect(
+                toggleRect.xMax - closeButtonSize - 1,
+                toggleRect.y + (toggleRect.height / 2 - closeButtonSize / 2),
+                closeButtonSize,
+                closeButtonSize);
+
+            GUI.Button(closeTabRect, closeImage, EditorStyles.label);
+
+            return new Rect(
+                closeTabRect.x - 1,
+                closeTabRect.y - 1,
+                closeTabRect.width + 2,
+                closeTabRect.height + 2);
+        }
+
+        static void DrawUnderline(Rect toggleRect)
+        {
+            GUIStyle activeTabStyle =
+                UnityStyles.PlasticWindow.ActiveTabUnderline;
+
+            Rect underlineRect = new Rect(
+                toggleRect.x,
+                toggleRect.yMax - activeTabStyle.fixedHeight,
+                toggleRect.width,
+                activeTabStyle.fixedHeight);
+
+            GUI.Label(underlineRect, string.Empty, activeTabStyle);
+        }
+
+        static bool IsTabClickWithMiddleButton(Rect toggleRect, Event currentEvent)
+        {
+            if (currentEvent.button != 2)
+                return false;
+
+            return toggleRect.height > 1 &&
+                   toggleRect.Contains(Event.current.mousePosition);
+        }
+
+        static Texture GetCloseImage(CloseButtonState state)
+        {
+            if (state == CloseButtonState.Hovered)
+                return Images.GetHoveredCloseIcon();
+
+            if (state == CloseButtonState.Clicked)
+                return Images.GetClickedCloseIcon();
+
+            return Images.GetCloseIcon();
+        }
+
+        void SetCloseButtonState(
+            CloseButtonState newState,
+            Action repaintAction)
+        {
+            if (mCloseButtonState == newState)
+                return;
+
+            mCloseButtonState = newState;
+
+            if (repaintAction != null)
+                repaintAction();
+        }
+
+        Rect mCloseButtonRect;
+        CloseButtonState mCloseButtonState;
+
+        enum CloseButtonState
+        {
+            Normal,
+            Clicked,
+            Hovered,
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/TabButton.cs.meta b/Editor/PlasticSCM/UI/TabButton.cs.meta
new file mode 100644
index 0000000..fa8dfa0
--- /dev/null
+++ b/Editor/PlasticSCM/UI/TabButton.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 076df9ed85621764881a4d81dbd08046
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Tree.meta b/Editor/PlasticSCM/UI/Tree.meta
new file mode 100644
index 0000000..7ab65f0
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b642e1c7eeddd064c9520df476000c0c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Tree/DrawTreeViewItem.cs b/Editor/PlasticSCM/UI/Tree/DrawTreeViewItem.cs
new file mode 100644
index 0000000..8224605
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/DrawTreeViewItem.cs
@@ -0,0 +1,255 @@
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI.Tree
+{
+    internal static class DrawTreeViewItem
+    {
+        internal static void InitializeStyles()
+        {
+            if (EditorStyles.label == null)
+                return;
+
+            TreeView.DefaultStyles.label = UnityStyles.Tree.Label;
+            TreeView.DefaultStyles.boldLabel = UnityStyles.Tree.BoldLabel;
+        }
+
+        internal static void ForCategoryItem(
+            Rect rowRect,
+            float rowHeight,
+            int depth,
+            Texture icon,
+            string label,
+            bool isSelected,
+            bool isFocused)
+        {
+            float indent = GetIndent(depth);
+
+            rowRect.x += indent;
+            rowRect.width -= indent;
+
+            rowRect = DrawIconLeft(rowRect, rowHeight, icon, null);
+            TreeView.DefaultGUI.Label(rowRect, label, isSelected, isFocused);
+        }
+
+        internal static bool ForCheckableCategoryItem(
+            Rect rowRect,
+            float rowHeight,
+            int depth,
+            Texture icon,
+            string label,
+            bool isSelected,
+            bool isFocused,
+            bool wasChecked,
+            bool hadCheckedChildren)
+        {
+            float indent = GetIndent(depth);
+
+            rowRect.x += indent;
+            rowRect.width -= indent;
+
+            Rect checkRect = GetCheckboxRect(rowRect, rowHeight);
+
+            if (!wasChecked && hadCheckedChildren)
+                EditorGUI.showMixedValue = true;
+
+            bool isChecked = EditorGUI.Toggle(checkRect, wasChecked);
+            EditorGUI.showMixedValue = false;
+
+            rowRect.x = checkRect.xMax - 4;
+            rowRect.width -= checkRect.width;
+
+            rowRect = DrawIconLeft(rowRect, rowHeight, icon, null);
+
+            TreeView.DefaultGUI.Label(rowRect, label, isSelected, isFocused);
+
+            return isChecked;
+        }
+
+        internal static void ForItemCell(
+            Rect rect,
+            float rowHeight,
+            int depth,
+            Texture icon,
+            GetChangesOverlayIcon.Data overlayIconData,
+            string label,
+            bool isSelected,
+            bool isFocused,
+            bool isBoldText,
+            bool isSecondaryLabel)
+        {
+            float indent = GetIndent(depth);
+
+            rect.x += indent;
+            rect.width -= indent;
+
+            rect = DrawIconLeft(
+                rect, rowHeight, icon, overlayIconData);
+
+            if (isSecondaryLabel)
+            {
+                ForSecondaryLabel(rect, label, isSelected, isFocused, isBoldText);
+                return;
+            }
+
+            ForLabel(rect, label, isSelected, isFocused, isBoldText);
+        }
+
+        internal static bool ForCheckableItemCell(
+            Rect rect,
+            float rowHeight,
+            int depth,
+            Texture icon,
+            GetChangesOverlayIcon.Data overlayIconData,
+            string label,
+            bool isSelected,
+            bool isFocused,
+            bool isHighlighted,
+            bool wasChecked)
+        {
+            float indent = GetIndent(depth);
+
+            rect.x += indent;
+            rect.width -= indent;
+
+            Rect checkRect = GetCheckboxRect(rect, rowHeight);
+
+            bool isChecked = EditorGUI.Toggle(checkRect, wasChecked);
+
+            rect.x = checkRect.xMax;
+            rect.width -= checkRect.width;
+
+            rect = DrawIconLeft(
+                rect, rowHeight, icon, overlayIconData);
+
+            if (isHighlighted)
+                TreeView.DefaultGUI.BoldLabel(rect, label, isSelected, isFocused);
+            else
+                TreeView.DefaultGUI.Label(rect, label, isSelected, isFocused);
+
+            return isChecked;
+        }
+
+        static Rect DrawIconLeft(
+            Rect rect,
+            float rowHeight,
+            Texture icon,
+            GetChangesOverlayIcon.Data overlayIconData)
+        {
+            if (icon == null)
+                return rect;
+
+            float iconWidth = rowHeight * ((float)icon.width / icon.height);
+
+            Rect iconRect = new Rect(rect.x, rect.y, iconWidth, rowHeight);
+
+            EditorGUI.LabelField(iconRect, new GUIContent(icon), UnityStyles.Tree.IconStyle);
+
+            if (overlayIconData != null && overlayIconData.Texture != null)
+            {
+                Rect overlayIconRect = new Rect(
+                    iconRect.x + overlayIconData.XOffset,
+                    iconRect.y + overlayIconData.YOffset,
+                    overlayIconData.Size, overlayIconData.Size);
+
+                GUI.DrawTexture(
+                    overlayIconRect, overlayIconData.Texture,
+                    ScaleMode.ScaleToFit);
+            }
+
+            rect.x += iconRect.width;
+            rect.width -= iconRect.width;
+
+            return rect;
+        }
+
+        static Rect GetCheckboxRect(Rect rect, float rowHeight)
+        {
+            return new Rect(
+                rect.x,
+                rect.y + UnityConstants.TREEVIEW_CHECKBOX_Y_OFFSET,
+                UnityConstants.TREEVIEW_CHECKBOX_SIZE,
+                rect.height);
+        }
+
+        static float GetIndent(int depth)
+        {
+            if (depth == -1)
+                return 0;
+
+            return 16 + (depth * 16);
+        }
+
+        internal static void ForSecondaryLabelRightAligned(
+            Rect rect,
+            string label,
+            bool isSelected,
+            bool isFocused,
+            bool isBoldText)
+        {
+            if (Event.current.type != EventType.Repaint)
+                return;
+
+            if (isBoldText)
+            {
+                GUIStyle secondaryBoldRightAligned =
+                    UnityStyles.Tree.SecondaryLabelBoldRightAligned;
+                secondaryBoldRightAligned.Draw(
+                    rect, label, false, true, isSelected, isFocused);
+                return;
+            }
+
+            GUIStyle secondaryLabelRightAligned =
+                UnityStyles.Tree.SecondaryLabelRightAligned;
+            secondaryLabelRightAligned.Draw(
+                rect, label, false, true, isSelected, isFocused);
+        }
+
+        internal static void ForSecondaryLabel(
+            Rect rect,
+            string label,
+            bool isSelected,
+            bool isFocused,
+            bool isBoldText)
+        {
+            if (Event.current.type != EventType.Repaint)
+                return;
+
+            if (isBoldText)
+            {
+                GUIStyle secondaryBoldLabel =
+                    UnityStyles.Tree.SecondaryBoldLabel;
+                secondaryBoldLabel.Draw(
+                    rect, label, false, true, isSelected, isFocused);
+                return;
+            }
+
+            GUIStyle secondaryLabel =
+                UnityStyles.Tree.SecondaryLabel;
+            secondaryLabel.Draw(
+                rect, label, false, true, isSelected, isFocused);
+        }
+
+        internal static void ForLabel(
+            Rect rect,
+            string label,
+            bool isSelected,
+            bool isFocused,
+            bool isBoldText)
+        {
+            if (Event.current.type != EventType.Repaint)
+                return;
+
+            if (isBoldText)
+            {
+                TreeView.DefaultStyles.boldLabel.Draw(
+                    rect, label, false, true, isSelected, isFocused);
+                return;
+            }
+
+            TreeView.DefaultStyles.label.Draw(
+                rect, label, false, true, isSelected, isFocused);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Tree/DrawTreeViewItem.cs.meta b/Editor/PlasticSCM/UI/Tree/DrawTreeViewItem.cs.meta
new file mode 100644
index 0000000..3932d76
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/DrawTreeViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 595175d7af8f8234a9336a60e33b4f32
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Tree/GetChangesOverlayIcon.cs b/Editor/PlasticSCM/UI/Tree/GetChangesOverlayIcon.cs
new file mode 100644
index 0000000..af0546e
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/GetChangesOverlayIcon.cs
@@ -0,0 +1,265 @@
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using Codice.ThemeImages;
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+
+using GluonIncomingChangeInfo = PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges.IncomingChangeInfo;
+using GluonIncomingChangeCategory = PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges.IncomingChangeCategory;
+using Unity.PlasticSCM.Editor.AssetsOverlays;
+
+namespace Unity.PlasticSCM.Editor.UI.Tree
+{
+    static class GetChangesOverlayIcon
+    {
+        internal class Data
+        {
+            internal readonly Texture Texture;
+            internal readonly float XOffset;
+            internal readonly float YOffset;
+            internal readonly float Size;
+
+            internal Data(Texture texture, float xOffset, float yOffset, float size)
+            {
+                Texture = texture;
+                XOffset = xOffset;
+                YOffset = yOffset;
+                Size = size;
+            }
+        }
+
+        internal static Data ForPlasticIncomingChange(
+            IncomingChangeInfo incomingChange,
+            bool isSolvedConflict)
+        {
+            if (incomingChange.CategoryType == IncomingChangesCategory.Type.FileConflicts ||
+                incomingChange.CategoryType == IncomingChangesCategory.Type.DirectoryConflicts)
+                return ForConflict(isSolvedConflict);
+
+            if (incomingChange.IsXLink())
+                return BuildData.ForXLink();
+
+            if (incomingChange.CategoryType == IncomingChangesCategory.Type.Deleted)
+                return BuildData.ForDeletedOnServer();
+
+            if (incomingChange.CategoryType == IncomingChangesCategory.Type.Changed)
+                return BuildData.ForOutOfDate();
+
+            return null;
+        }
+
+        internal static Data ForGluonIncomingChange(
+            GluonIncomingChangeInfo incomingChange,
+            bool isSolvedConflict)
+        {
+            if (incomingChange.CategoryType == GluonIncomingChangeCategory.Type.Conflicted)
+                return ForConflict(isSolvedConflict);
+
+            if (incomingChange.IsXLink())
+                return BuildData.ForXLink();
+
+            if (incomingChange.CategoryType == GluonIncomingChangeCategory.Type.Deleted)
+                return BuildData.ForDeletedOnServer();
+
+            if (incomingChange.CategoryType == GluonIncomingChangeCategory.Type.Changed)
+                return BuildData.ForOutOfDate();
+
+            return null;
+        }
+
+        internal static Data ForPendingChange(
+            ChangeInfo changeInfo,
+            bool isConflict)
+        {
+            if (isConflict)
+                return BuildData.ForConflicted();
+
+            ItemIconImageType type = ChangeInfoView.
+                GetIconImageType(changeInfo);
+
+            if (ChangeTypesOperator.AreAllSet(
+                    changeInfo.ChangeTypes, ChangeTypes.Added))
+                return BuildData.ForAdded();
+
+            switch (type)
+            {
+                case ItemIconImageType.Ignored:
+                    return BuildData.ForIgnored();
+                case ItemIconImageType.Private:
+                    return BuildData.ForPrivated();
+                case ItemIconImageType.Deleted:
+                    return BuildData.ForDeleted();
+                case ItemIconImageType.CheckedOut:
+                    return BuildData.ForCheckedOut();
+                default:
+                    return null;
+            }
+        }
+
+        internal static Data ForAssetStatus(AssetStatus status)
+        {
+            switch (status)
+            {
+                case AssetStatus.Ignored:
+                    return BuildData.ForIgnored();
+                case AssetStatus.Private:
+                    return BuildData.ForPrivated();
+                case AssetStatus.Added:
+                    return BuildData.ForAdded();
+                case AssetStatus.Checkout:
+                    return BuildData.ForCheckedOut();
+                case AssetStatus.OutOfDate:
+                    return BuildData.ForOutOfDate();
+                case AssetStatus.Conflicted:
+                    return BuildData.ForConflicted();
+                case AssetStatus.DeletedOnServer:
+                    return BuildData.ForDeletedOnServer();
+                case AssetStatus.Locked:
+                    return BuildData.ForLocked();
+                case AssetStatus.LockedRemote:
+                    return BuildData.ForLockedRemote();
+            }
+
+            return null;
+        }
+
+        static Data ForConflict(bool isResolved)
+        {
+            if (isResolved)
+                return BuildData.ForOk();
+
+            return BuildData.ForConflicted();
+        }
+
+        static class BuildData
+        {
+            internal static Data ForOk()
+            {
+                return new Data(
+                    Images.GetImage(Images.Name.Ok),
+                    4f, 4f, SIZE);
+            }
+
+            internal static Data ForXLink()
+            {
+                return new Data(
+                    Images.GetImage(Images.Name.XLink),
+                    2f, 3f, SIZE);
+            }
+
+            internal static Data ForIgnored()
+            {
+                return new Data(
+                    Images.GetImage(Images.Name.Ignored),
+                    GetLeftXOffset(),
+                    GetBottomYOffset(),
+                    SIZE);
+            }
+
+            internal static Data ForPrivated()
+            {
+                return new Data(
+                    Images.GetPrivatedOverlayIcon(),
+                    GetLeftXOffset(),
+                    GetBottomYOffset(),
+                    SIZE);
+            }
+
+            internal static Data ForAdded()
+            {
+                return new Data(
+                    Images.GetAddedOverlayIcon(),
+                    GetLeftXOffset(),
+                    GetTopYOffset(),
+                    SIZE);
+            }
+
+            internal static Data ForDeleted()
+            {
+                return new Data(
+                    Images.GetDeletedOverlayIcon(),
+                    GetLeftXOffset(),
+                    GetTopYOffset(),
+                    SIZE);
+            }
+
+            internal static Data ForCheckedOut()
+            {
+                return new Data(
+                    Images.GetCheckedOutOverlayIcon(),
+                    GetLeftXOffset(),
+                    GetTopYOffset(),
+                    SIZE);
+            }
+
+            internal static Data ForDeletedOnServer()
+            {
+                return new Data(
+                    Images.GetDeletedRemoteOverlayIcon(),
+                    GetRightXOffset(),
+                    GetTopYOffset(),
+                    SIZE);
+            }
+
+            internal static Data ForOutOfDate()
+            {
+                return new Data(
+                    Images.GetOutOfSyncOverlayIcon(),
+                    GetRightXOffset(),
+                    GetBottomYOffset(),
+                    SIZE);
+            }
+
+            internal static Data ForLocked()
+            {
+                return new Data(
+                    Images.GetLockedLocalOverlayIcon(),
+                    GetLeftXOffset(),
+                    GetTopYOffset(),
+                    SIZE);
+            }
+
+            internal static Data ForLockedRemote()
+            {
+                return new Data(
+                    Images.GetLockedRemoteOverlayIcon(),
+                    GetRightXOffset(),
+                    GetTopYOffset(),
+                    SIZE);
+            }
+
+            static float GetLeftXOffset()
+            {
+                return -4f;
+            }
+
+            internal static Data ForConflicted()
+            {
+                return new Data(
+                    Images.GetConflictedOverlayIcon(),
+                    GetLeftXOffset(),
+                    GetBottomYOffset(),
+                    SIZE);
+            }
+
+            static float GetRightXOffset()
+            {
+                return 8f;
+            }
+
+            static float GetBottomYOffset()
+            {
+                return UnityConstants.TREEVIEW_ROW_HEIGHT - SIZE + 2f;
+            }
+
+            static float GetTopYOffset()
+            {
+                return -1f;
+            }
+
+            const float SIZE = 16;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Tree/GetChangesOverlayIcon.cs.meta b/Editor/PlasticSCM/UI/Tree/GetChangesOverlayIcon.cs.meta
new file mode 100644
index 0000000..2ed4f36
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/GetChangesOverlayIcon.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d5366deaa0659eb44aa77a86d8bdc01a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Tree/ListViewItemIds.cs b/Editor/PlasticSCM/UI/Tree/ListViewItemIds.cs
new file mode 100644
index 0000000..cfd4b5c
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/ListViewItemIds.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Unity.PlasticSCM.Editor.UI.Tree
+{
+    internal class ListViewItemIds<I>
+    {
+        internal void Clear()
+        {
+            mCacheByInfo.Clear();
+        }
+
+        internal List<KeyValuePair<I, int>> GetInfoItems()
+        {
+            return mCacheByInfo.ToList();
+        }
+
+        internal bool TryGetInfoItemId(I info, out int itemId)
+        {
+            return mCacheByInfo.TryGetValue(info, out itemId);
+        }
+
+        internal int AddInfoItem(I info)
+        {
+            int itemId = GetNextItemId();
+
+            mCacheByInfo.Add(info, itemId);
+
+            return itemId;
+        }
+
+        int GetNextItemId()
+        {
+            return mCacheByInfo.Count + 1;
+        }
+
+        Dictionary<I, int> mCacheByInfo = new Dictionary<I, int>();
+    }
+}
+
diff --git a/Editor/PlasticSCM/UI/Tree/ListViewItemIds.cs.meta b/Editor/PlasticSCM/UI/Tree/ListViewItemIds.cs.meta
new file mode 100644
index 0000000..18e1802
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/ListViewItemIds.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8497dad3a6163fe40a30ca297edd7b2d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Tree/TableViewOperations.cs b/Editor/PlasticSCM/UI/Tree/TableViewOperations.cs
new file mode 100644
index 0000000..b2efba5
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/TableViewOperations.cs
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+
+namespace Unity.PlasticSCM.Editor.UI.Tree
+{
+    internal static class TableViewOperations
+    {
+        internal static int GetFirstSelectedRow(
+            TreeView treeView)
+        {
+            IList<int> selectedIds = treeView.GetSelection();
+
+            if (selectedIds.Count == 0)
+                return -1;
+
+            return selectedIds[0];
+        }
+
+        internal static void SelectFirstRow(
+            TreeView treeView)
+        {
+            int rowCount = treeView.GetRows().Count;
+
+            if (rowCount == 0)
+                return;
+
+            SetSelectionAndScroll(
+                treeView, new List<int> { 1 });
+        }
+
+        internal static void SelectDefaultRow(
+            TreeView treeView, int defaultRow)
+        {
+            int rowCount = treeView.GetRows().Count;
+
+            if (defaultRow == -1 || rowCount == 0)
+                return;
+
+            if (defaultRow >= rowCount)
+                defaultRow = rowCount - 1;
+
+            SetSelectionAndScroll(
+                treeView, new List<int> { defaultRow });
+        }
+
+        internal static void SetSelectionAndScroll(
+            TreeView treeView, List<int> idsToSelect)
+        {
+            treeView.SetSelection(
+                idsToSelect,
+                TreeViewSelectionOptions.FireSelectionChanged |
+                TreeViewSelectionOptions.RevealAndFrame);
+        }
+
+        internal static void ScrollToSelection(
+            TreeView treeView)
+        {
+            if (!treeView.HasSelection())
+                return;
+
+            int itemId = treeView.GetSelection()[0];
+
+            if (!IsVisible(itemId, treeView))
+                return;
+
+            treeView.FrameItem(itemId);
+        }
+
+        static bool IsVisible(int id, TreeView treeView)
+        {
+            foreach (TreeViewItem item in treeView.GetRows())
+            {
+                if (item.id == id)
+                    return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Tree/TableViewOperations.cs.meta b/Editor/PlasticSCM/UI/Tree/TableViewOperations.cs.meta
new file mode 100644
index 0000000..6cf65cc
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/TableViewOperations.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 014287a1a6b67dd4e867168699dfdc2a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Tree/TreeHeaderColumns.cs b/Editor/PlasticSCM/UI/Tree/TreeHeaderColumns.cs
new file mode 100644
index 0000000..0488d1a
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/TreeHeaderColumns.cs
@@ -0,0 +1,62 @@
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI.Tree
+{
+    internal static class TreeHeaderColumns
+    {
+        internal static void SetTitles(
+            MultiColumnHeaderState.Column[] columns, string[] headerTitles)
+        {
+            for (int i = 0; i < headerTitles.Length; i++)
+                columns[i].headerContent = new GUIContent(headerTitles[i]);
+        }
+
+        internal static void SetVisibilities(
+            MultiColumnHeaderState.Column[] columns, bool[] visibilities)
+        {
+            for (int i = 0; i < visibilities.Length; i++)
+                columns[i].allowToggleVisibility = visibilities[i];
+        }
+
+        internal static void SetWidths(
+            MultiColumnHeaderState.Column[] columns, float[] widths)
+        {
+            for (int i = 0; i < widths.Length; i++)
+                columns[i].width = widths[i];
+        }
+
+        internal static string[] GetTitles(
+            MultiColumnHeaderState.Column[] columns)
+        {
+            string[] titles = new string[columns.Length];
+
+            for (int i = 0; i < columns.Length; i++)
+                titles[i] = columns[i].headerContent.text;
+
+            return titles;
+        }
+
+        internal static bool[] GetVisibilities(
+            MultiColumnHeaderState.Column[] columns)
+        {
+            bool[] visibilities = new bool[columns.Length];
+
+            for (int i = 0; i < columns.Length; i++)
+                visibilities[i] = columns[i].allowToggleVisibility;
+
+            return visibilities;
+        }
+
+        internal static float[] GetWidths(
+            MultiColumnHeaderState.Column[] columns)
+        {
+            float[] widths = new float[columns.Length];
+
+            for (int i = 0; i < columns.Length; i++)
+                widths[i] = columns[i].width;
+
+            return widths;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Tree/TreeHeaderColumns.cs.meta b/Editor/PlasticSCM/UI/Tree/TreeHeaderColumns.cs.meta
new file mode 100644
index 0000000..ecb3bb9
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/TreeHeaderColumns.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c3c7b1998f264b443a5b5c67a189149a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Tree/TreeHeaderSettings.cs b/Editor/PlasticSCM/UI/Tree/TreeHeaderSettings.cs
new file mode 100644
index 0000000..1976a22
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/TreeHeaderSettings.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Linq;
+
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+
+namespace Unity.PlasticSCM.Editor.UI.Tree
+{
+    internal static class TreeHeaderSettings
+    {
+        internal static void Load(
+            MultiColumnHeaderState headerState,
+            string treeSettingsName,
+            int defaultSortColumnIdx,
+            bool defaultSortedAscending = true)
+        {
+            var visibleColumns = EditorPrefs.GetString(
+                GetSettingKey(treeSettingsName, VISIBLE_COLUMNS_KEY), string.Empty)
+                    .Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
+                    .Select(idx => int.Parse(idx))
+                    .ToArray();
+            var columnWidths = EditorPrefs.GetString(
+                GetSettingKey(treeSettingsName, COLUMNS_WIDTHS_KEY), string.Empty)
+                    .Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
+                    .Select(w => float.Parse(w))
+                    .ToArray();
+
+            if (visibleColumns.Length > 0)
+                headerState.visibleColumns = visibleColumns;
+
+            if (headerState.columns.Length == columnWidths.Length)
+                TreeHeaderColumns.SetWidths(headerState.columns, columnWidths);
+
+            if (defaultSortColumnIdx == UnityConstants.UNSORT_COLUMN_ID)
+                return;
+
+            var sortColumnIdx = EditorPrefs.GetInt(
+                GetSettingKey(treeSettingsName, SORT_COLUMN_INDEX_KEY), defaultSortColumnIdx);
+            var sortColumnAscending = EditorPrefs.GetBool(
+                GetSettingKey(treeSettingsName, SORT_ASCENDING_KEY), defaultSortedAscending);
+
+            headerState.sortedColumnIndex = sortColumnIdx;
+            headerState.columns[sortColumnIdx].sortedAscending = sortColumnAscending;
+        }
+
+        internal static void Save(
+            MultiColumnHeaderState headerState,
+            string treeSettingsName)
+        {
+            int[] visibleColumns = headerState.visibleColumns;
+            float[] columnWidths = TreeHeaderColumns.GetWidths(headerState.columns);
+
+            EditorPrefs.SetString(
+                GetSettingKey(treeSettingsName, VISIBLE_COLUMNS_KEY),
+                string.Join(",", visibleColumns.Select(idx => idx.ToString()).ToArray()));
+            EditorPrefs.SetString(
+                GetSettingKey(treeSettingsName, COLUMNS_WIDTHS_KEY),
+                string.Join(",", columnWidths.Select(w => w.ToString()).ToArray()));
+
+            int sortColumnIdx = headerState.sortedColumnIndex;
+
+            if (sortColumnIdx == UnityConstants.UNSORT_COLUMN_ID)
+                return;
+
+            bool sortColumnAscending = headerState.
+                columns[headerState.sortedColumnIndex].sortedAscending;
+
+            EditorPrefs.SetInt(
+                GetSettingKey(treeSettingsName, SORT_COLUMN_INDEX_KEY),
+                sortColumnIdx);
+            EditorPrefs.SetBool(
+                GetSettingKey(treeSettingsName, SORT_ASCENDING_KEY),
+                sortColumnAscending);
+        }
+
+        internal static void Clear(string treeSettingsName)
+        {
+            EditorPrefs.DeleteKey(
+                GetSettingKey(treeSettingsName, VISIBLE_COLUMNS_KEY));
+            EditorPrefs.DeleteKey(
+                GetSettingKey(treeSettingsName, COLUMNS_WIDTHS_KEY));
+            EditorPrefs.DeleteKey(
+                GetSettingKey(treeSettingsName, SORT_COLUMN_INDEX_KEY));
+            EditorPrefs.DeleteKey(
+                GetSettingKey(treeSettingsName, SORT_ASCENDING_KEY));
+        }
+
+        static string GetSettingKey(string treeSettingsName, string key)
+        {
+            return string.Format(treeSettingsName, PlayerSettings.productGUID, key);
+        }
+
+        static string VISIBLE_COLUMNS_KEY = "VisibleColumns";
+        static string COLUMNS_WIDTHS_KEY = "ColumnWidths";
+        static string SORT_COLUMN_INDEX_KEY = "SortColumnIdx";
+        static string SORT_ASCENDING_KEY = "SortAscending";
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/UI/Tree/TreeHeaderSettings.cs.meta b/Editor/PlasticSCM/UI/Tree/TreeHeaderSettings.cs.meta
new file mode 100644
index 0000000..aafed26
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/TreeHeaderSettings.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 38b05cc5af29cf844a31910eb512e92f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/Tree/TreeViewItemIds.cs b/Editor/PlasticSCM/UI/Tree/TreeViewItemIds.cs
new file mode 100644
index 0000000..ffa9e11
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/TreeViewItemIds.cs
@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Unity.PlasticSCM.Editor.UI.Tree
+{
+    internal class TreeViewItemIds<C, I>
+    {
+        internal void Clear()
+        {
+            mCacheByCategories.Clear();
+            mCacheByInfo.Clear();
+        }
+
+        internal List<int> GetCategoryIds()
+        {
+            return new List<int>(mCacheByCategories.Values);
+        }
+
+        internal List<KeyValuePair<I, int>> GetInfoItems()
+        {
+            return mCacheByInfo.ToList();
+        }
+
+        internal bool TryGetCategoryItemId(C category, out int itemId)
+        {
+            return mCacheByCategories.TryGetValue(category, out itemId);
+        }
+
+        internal bool TryGetInfoItemId(I info, out int itemId)
+        {
+            return mCacheByInfo.TryGetValue(info, out itemId);
+        }
+
+        internal int AddCategoryItem(C category)
+        {
+            int itemId = GetNextItemId();
+
+            mCacheByCategories.Add(category, itemId);
+
+            return itemId;
+        }
+
+        internal int AddInfoItem(I info)
+        {
+            int itemId = GetNextItemId();
+
+            mCacheByInfo.Add(info, itemId);
+
+            return itemId;
+        }
+
+        int GetNextItemId()
+        {
+            return mCacheByCategories.Count
+                + mCacheByInfo.Count
+                + 1;
+        }
+
+        Dictionary<C, int> mCacheByCategories = new Dictionary<C, int>();
+        Dictionary<I, int> mCacheByInfo = new Dictionary<I, int>();
+    }
+}
diff --git a/Editor/PlasticSCM/UI/Tree/TreeViewItemIds.cs.meta b/Editor/PlasticSCM/UI/Tree/TreeViewItemIds.cs.meta
new file mode 100644
index 0000000..075cc40
--- /dev/null
+++ b/Editor/PlasticSCM/UI/Tree/TreeViewItemIds.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2986eff1677c33345b223bdaaee2d284
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UIElements.meta b/Editor/PlasticSCM/UI/UIElements.meta
new file mode 100644
index 0000000..a94b39f
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UIElements.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2e69b76b513515641800b4ffad031ae8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UIElements/LoadingSpinner.cs b/Editor/PlasticSCM/UI/UIElements/LoadingSpinner.cs
new file mode 100644
index 0000000..0776aea
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UIElements/LoadingSpinner.cs
@@ -0,0 +1,78 @@
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace Unity.PlasticSCM.Editor.UI.UIElements
+{
+    internal class LoadingSpinner : VisualElement
+    {
+        internal LoadingSpinner()
+        {
+            mStarted = false;
+
+            // add child elements to set up centered spinner rotation
+            VisualElement spinner = new VisualElement();
+            Add(spinner);
+
+            spinner.style.backgroundImage = Images.GetImage(Images.Name.Loading);
+            spinner.style.width = 16;
+            spinner.style.height = 16;
+            spinner.style.left = -8;
+            spinner.style.top = -8;
+
+            style.position = Position.Relative;
+            style.width = 16;
+            style.height = 16;
+            style.left = 8;
+            style.top = 8;
+        }
+
+        internal void Dispose()
+        {
+            if (mStarted)
+                EditorApplication.update -= UpdateProgress;
+        }
+
+        internal void Start()
+        {
+            if (mStarted)
+                return;
+
+            mRotation = 0;
+            mLastRotationTime = EditorApplication.timeSinceStartup;
+
+            EditorApplication.update += UpdateProgress;
+
+            mStarted = true;
+        }
+
+        internal void Stop()
+        {
+            if (!mStarted)
+                return;
+
+            EditorApplication.update -= UpdateProgress;
+
+            mStarted = false;
+        }
+
+        void UpdateProgress()
+        {
+            double currentTime = EditorApplication.timeSinceStartup;
+            double deltaTime = currentTime - mLastRotationTime;
+
+            transform.rotation = Quaternion.Euler(0, 0, mRotation);
+            mRotation += (int)(ROTATION_SPEED * deltaTime);
+            mRotation = mRotation % 360;
+            if (mRotation < 0) mRotation += 360;
+
+            mLastRotationTime = currentTime;
+        }
+
+        int mRotation;
+        double mLastRotationTime;
+        bool mStarted;
+
+        const int ROTATION_SPEED = 360; // Euler degrees per second
+    }
+}
diff --git a/Editor/PlasticSCM/UI/UIElements/LoadingSpinner.cs.meta b/Editor/PlasticSCM/UI/UIElements/LoadingSpinner.cs.meta
new file mode 100644
index 0000000..95c99b0
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UIElements/LoadingSpinner.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4664c2d6dd034f04eb60d4190ee2ffb7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UIElements/TabView.cs b/Editor/PlasticSCM/UI/UIElements/TabView.cs
new file mode 100644
index 0000000..c3b2b2f
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UIElements/TabView.cs
@@ -0,0 +1,87 @@
+using System.Collections.Generic;
+
+using UnityEngine.UIElements;
+
+using Unity.PlasticSCM.Editor;
+
+namespace Unity.PlasticSCM.Editor.UI.UIElements
+{
+    internal class TabView : VisualElement
+    {
+        internal TabView()
+        {
+            InitializeLayoutAndStyles();
+
+            BuildComponents();
+        }
+
+        internal Button AddTab(string name, VisualElement content)
+        {
+            mTabs.Add(name, content);
+
+            Button newButton = new Button()
+            {
+                text = name,
+                name = name
+            };
+
+            mButtons.Add(name, newButton);
+
+            newButton.clickable.clickedWithEventInfo += OnClickButton;
+
+            mTabArea.Add(newButton);
+
+            if (mTabs.Count == 1)
+                ButtonClicked(newButton);
+
+            return newButton;
+        }
+
+        internal void SwitchContent(VisualElement content)
+        {
+            mContentArea.Clear();
+            mContentArea.Add(content);
+
+            foreach (Button button in mButtons.Values)
+                button.RemoveFromClassList("active");
+        }
+
+        void OnClickButton(EventBase eventBase)
+        {
+            ButtonClicked((Button)eventBase.target);
+        }
+
+        void ButtonClicked(Button clickedButton)
+        {
+            VisualElement content;
+            mTabs.TryGetValue(clickedButton.text, out content);
+
+            mContentArea.Clear();
+            mContentArea.Add(content);
+
+            foreach (Button button in mButtons.Values)
+                button.RemoveFromClassList("active");
+
+            clickedButton.AddToClassList("active");
+        }
+
+        void BuildComponents()
+        {
+            mTabArea = this.Query<VisualElement>("TabArea").First();
+            mContentArea = this.Query<VisualElement>("ContentArea").First();
+        }
+
+        void InitializeLayoutAndStyles()
+        {
+            this.LoadLayout(typeof(TabView).Name);
+
+            this.LoadStyle(typeof(TabView).Name);
+        }
+
+        VisualElement mContentArea;
+        VisualElement mTabArea;
+
+        Dictionary<string, VisualElement> mTabs = new Dictionary<string, VisualElement>();
+        Dictionary<string, Button> mButtons = new Dictionary<string, Button>();
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/UI/UIElements/TabView.cs.meta b/Editor/PlasticSCM/UI/UIElements/TabView.cs.meta
new file mode 100644
index 0000000..50e07e8
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UIElements/TabView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3800274d3c9ba2b4b984d8b076a504b5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UIElements/UIElementsExtensions.cs b/Editor/PlasticSCM/UI/UIElements/UIElementsExtensions.cs
new file mode 100644
index 0000000..986ca32
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UIElements/UIElementsExtensions.cs
@@ -0,0 +1,120 @@
+using System.IO;
+
+using UnityEditor;
+using UnityEngine.UIElements;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.AssetUtils;
+
+namespace Unity.PlasticSCM.Editor.UI.UIElements
+{
+    internal static class UIElementsExtensions
+    {
+        internal static void LoadLayout(
+            this VisualElement element,
+            string className)
+        {
+            string uxmlRelativePath = Path.Combine(
+                AssetsPath.GetLayoutsFolderRelativePath(),
+                string.Format("{0}.uxml", className));
+
+            VisualTreeAsset visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
+                uxmlRelativePath);
+
+            if (visualTree == null)
+            {
+                UnityEngine.Debug.LogErrorFormat(
+                    "Layout {0} not found at path {1}",
+                    className,
+                    uxmlRelativePath);
+                return;
+            }
+
+            visualTree.CloneTree(element);
+        }
+
+        internal static void LoadStyle(
+            this VisualElement element,
+            string className)
+        {
+            string ussRelativePath = Path.Combine(
+                AssetsPath.GetStylesFolderRelativePath(),
+                string.Format("{0}.uss", className));
+
+            StyleSheet sheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+                ussRelativePath);
+
+            if (sheet != null)
+            {
+                element.styleSheets.Add(sheet);
+            }
+
+            string ussSkinRelativePath = Path.Combine(
+                AssetsPath.GetStylesFolderRelativePath(),
+                string.Format("{0}.{1}.uss",
+                    className, EditorGUIUtility.isProSkin ? "dark" : "light"));
+
+            StyleSheet skinSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+                ussSkinRelativePath);
+
+            if (skinSheet == null)
+                return;
+
+            element.styleSheets.Add(skinSheet);
+        }
+
+        internal static void FocusOnceLoaded(
+            this TextField elem)
+        {
+            // Really weird behavior from UIElements, apperently in order
+            // to focus a text field you have to wait for it to attach to
+            // the panel and then focus it's TextInputBaseField child
+            // control rather than the TextField itself. For more see:
+            // https://forum.unity.com/threads/focus-doesnt-seem-to-work.901130/
+            elem.RegisterCallback<AttachToPanelEvent>(
+                _ => elem.Q(TextInputBaseField<string>.textInputUssName).Focus());
+        }
+
+        internal static void FocusWorkaround(this TextField textField)
+        {
+            // https://issuetracker.unity3d.com/issues/uielements-textfield-is-not-focused-and-you-are-not-able-to-type-in-characters-when-using-focus-method
+            textField.Q("unity-text-input").Focus();
+        }
+
+        internal static void SetControlImage(
+            this VisualElement element,
+            string name,
+            Images.Name imageName)
+        {
+            Image imageElem = element.Query<Image>(name).First();
+            imageElem.image = Images.GetImage(imageName);
+        }
+
+        internal static void SetControlImage(
+            this VisualElement element,
+            string name,
+            PlasticGui.Help.HelpImage imageName)
+        {
+            Image imageElem = element.Query<Image>(name).First();
+            imageElem.image = Images.GetHelpImage(imageName);
+        }
+
+        internal static void SetControlText<T>(
+            this VisualElement element,
+            string name, PlasticLocalization.Name fieldName,
+            params string[] format) where T : VisualElement
+        {
+            dynamic control = element.Query<T>(name).First();
+            string str = PlasticLocalization.GetString(fieldName);
+            control.text = format.Length > 0 ? string.Format(str, format) : str;
+        }
+
+        internal static void SetControlLabel<T>(
+            this VisualElement element,
+            string name, PlasticLocalization.Name fieldName)  where T : VisualElement
+        {
+            dynamic control = element.Query<T>(name).First();
+            control.label = PlasticLocalization.GetString(fieldName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/UI/UIElements/UIElementsExtensions.cs.meta b/Editor/PlasticSCM/UI/UIElements/UIElementsExtensions.cs.meta
new file mode 100644
index 0000000..32b9a17
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UIElements/UIElementsExtensions.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: daa34ff7d97bebd41866fd45e507c80e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UnityConstants.cs b/Editor/PlasticSCM/UI/UnityConstants.cs
new file mode 100644
index 0000000..8a8bd0b
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityConstants.cs
@@ -0,0 +1,93 @@
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class UnityConstants
+    {
+        internal const float CANCEL_BUTTON_SIZE = 15;
+
+        internal const float SMALL_BUTTON_WIDTH = 40;
+        internal const float REGULAR_BUTTON_WIDTH = 60;
+        internal const float LARGE_BUTTON_WIDTH = 100;
+        internal const float EXTRA_LARGE_BUTTON_WIDTH = 130;
+
+        internal const float SEARCH_FIELD_WIDTH = 550;
+
+        internal const string TREEVIEW_META_LABEL = " +meta";
+        internal const float TREEVIEW_CHECKBOX_SIZE = 17;
+        internal const float TREEVIEW_BASE_INDENT = 16f;
+        internal const float FIRST_COLUMN_WITHOUT_ICON_INDENT = 5;
+#if UNITY_2019_1_OR_NEWER
+        internal const float DROPDOWN_ICON_Y_OFFSET = 2;
+        internal const float TREEVIEW_FOLDOUT_Y_OFFSET = 0;
+        internal const float TREEVIEW_ROW_HEIGHT = 21;
+        internal const float TREEVIEW_HEADER_CHECKBOX_Y_OFFSET = 0;
+        internal const float TREEVIEW_CHECKBOX_Y_OFFSET = 0;
+        internal static float DIR_CONFLICT_VALIDATION_WARNING_LABEL_HEIGHT = 21;
+#else
+        internal const float DROPDOWN_ICON_Y_OFFSET = 5;
+        internal const float TREEVIEW_FOLDOUT_Y_OFFSET = 1;
+        internal const float TREEVIEW_ROW_HEIGHT = 20;
+        internal const float TREEVIEW_HEADER_CHECKBOX_Y_OFFSET = 6;
+        internal const float TREEVIEW_CHECKBOX_Y_OFFSET = 2;
+        internal static float DIR_CONFLICT_VALIDATION_WARNING_LABEL_HEIGHT = 18;
+#endif
+
+#if UNITY_2020_1_OR_NEWER
+        internal const float INSPECTOR_ACTIONS_BACK_RECTANGLE_TOP_MARGIN = -2;
+#else
+        internal const float INSPECTOR_ACTIONS_BACK_RECTANGLE_TOP_MARGIN = 0;
+#endif
+
+#if UNITY_2019
+        internal const int INSPECTOR_ACTIONS_HEADER_BACK_RECTANGLE_HEIGHT = 24;
+#else
+        internal const int INSPECTOR_ACTIONS_HEADER_BACK_RECTANGLE_HEIGHT = 7;
+#endif
+
+
+        internal const int LEFT_MOUSE_BUTTON = 0;
+        internal const int RIGHT_MOUSE_BUTTON = 1;
+
+        internal const int UNSORT_COLUMN_ID = -1;
+
+        internal const string PLASTIC_WINDOW_TITLE = "Plastic SCM";
+        internal const string LOGIN_WINDOW_TITLE = "Sign in to Plastic SCM";
+
+        internal const int ACTIVE_TAB_UNDERLINE_HEIGHT = 2;
+        internal const int SPLITTER_INDICATOR_HEIGHT = 1;
+
+        internal const double SEARCH_DELAYED_INPUT_ACTION_INTERVAL = 0.25;
+        internal const double SELECTION_DELAYED_INPUT_ACTION_INTERVAL = 0.25;
+        internal const double AUTO_REFRESH_DELAYED_INTERVAL = 0.25;
+        internal const double AUTO_REFRESH_PENDING_CHANGES_DELAYED_INTERVAL = 0.1;
+
+        internal const string PENDING_CHANGES_TABLE_SETTINGS_NAME = "{0}_PendingChangesTreeV2_{1}";
+        internal const string GLUON_INCOMING_CHANGES_TABLE_SETTINGS_NAME = "{0}_GluonIncomingChangesTree_{1}";
+        internal const string GLUON_INCOMING_ERRORS_TABLE_SETTINGS_NAME = "{0}_GluonIncomingErrorsList_{1}";
+        internal const string GLUON_UPDATE_REPORT_TABLE_SETTINGS_NAME = "{0}_GluonUpdateReportList_{1}";
+        internal const string DEVELOPER_INCOMING_CHANGES_TABLE_SETTINGS_NAME = "{0}_DeveloperIncomingChangesTree_{1}";
+        internal const string DEVELOPER_UPDATE_REPORT_TABLE_SETTINGS_NAME = "{0}_DeveloperUpdateReportList_{1}";
+        internal const string REPOSITORIES_TABLE_SETTINGS_NAME = "{0}_RepositoriesList_{1}";
+        internal const string CHANGESETS_TABLE_SETTINGS_NAME = "{0}_ChangesetsList_{1}";
+        internal const string CHANGESETS_DATE_FILTER_SETTING_NAME = "{0}_ChangesetsDateFilter_{1}";
+        internal const string CHANGESETS_SHOW_CHANGES_SETTING_NAME = "{0}_ShowChanges_{1}";
+        internal const string HISTORY_TABLE_SETTINGS_NAME = "{0}_HistoryList_{1}";
+
+        internal static class ChangesetsColumns
+        {
+            internal const float CHANGESET_NUMBER_WIDTH = 80;
+            internal const float CHANGESET_NUMBER_MIN_WIDTH = 50;
+            internal const float CREATION_DATE_WIDTH = 150;
+            internal const float CREATION_DATE_MIN_WIDTH = 100;
+            internal const float CREATED_BY_WIDTH = 200;
+            internal const float CREATED_BY_MIN_WIDTH = 110;
+            internal const float COMMENT_WIDTH = 300;
+            internal const float COMMENT_MIN_WIDTH = 100;
+            internal const float BRANCH_WIDTH = 160;
+            internal const float BRANCH_MIN_WIDTH = 90;
+            internal const float REPOSITORY_WIDTH = 210;
+            internal const float REPOSITORY_MIN_WIDTH = 90;
+            internal const float GUID_WIDTH = 270;
+            internal const float GUID_MIN_WIDTH = 100;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/UnityConstants.cs.meta b/Editor/PlasticSCM/UI/UnityConstants.cs.meta
new file mode 100644
index 0000000..6d44437
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityConstants.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c60feb8f0f5f57c4393eae9a43529616
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UnityEvents.cs b/Editor/PlasticSCM/UI/UnityEvents.cs
new file mode 100644
index 0000000..4343d11
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityEvents.cs
@@ -0,0 +1,56 @@
+using UnityEngine;
+
+using Codice.Utils;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class Keyboard
+    {
+        internal static bool IsShiftPressed(Event e)
+        {
+            return e.type == EventType.KeyDown
+                && e.shift;
+        }
+
+        internal static bool IsReturnOrEnterKeyPressed(Event e)
+        {
+            return IsKeyPressed(e, KeyCode.Return) ||
+                   IsKeyPressed(e, KeyCode.KeypadEnter);
+        }
+
+        internal static bool IsKeyPressed(Event e, KeyCode keyCode)
+        {
+            return e.type == EventType.KeyDown
+                && e.keyCode == keyCode;
+        }
+
+        internal static bool IsControlOrCommandKeyPressed(Event e)
+        {
+            if (PlatformIdentifier.IsMac())
+                return e.type == EventType.KeyDown && e.command;
+
+            return e.type == EventType.KeyDown && e.control;
+        }
+    }
+
+    internal class Mouse
+    {
+        internal static bool IsLeftMouseButtonPressed(Event e)
+        {
+            if (!e.isMouse)
+                return false;
+
+            return e.button == UnityConstants.LEFT_MOUSE_BUTTON
+                && e.type == EventType.MouseDown;
+        }
+
+        internal static bool IsRightMouseButtonPressed(Event e)
+        {
+            if (!e.isMouse)
+                return false;
+
+            return e.button == UnityConstants.RIGHT_MOUSE_BUTTON
+                && e.type == EventType.MouseDown;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UI/UnityEvents.cs.meta b/Editor/PlasticSCM/UI/UnityEvents.cs.meta
new file mode 100644
index 0000000..b8a4b73
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityEvents.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 023009af66be2da4d84bf23700528308
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UnityMenuItem.cs b/Editor/PlasticSCM/UI/UnityMenuItem.cs
new file mode 100644
index 0000000..0e60897
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityMenuItem.cs
@@ -0,0 +1,18 @@
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal static class UnityMenuItem
+    {
+        internal static string GetText(string menuName, string subMenuName)
+        {
+            return string.Format("{0}{1}{2}", menuName, SEPARATOR, subMenuName);
+        }
+
+        internal static string EscapedText(string menuName)
+        {
+            return menuName.Replace(SEPARATOR, ESCAPED_SEPARATOR);
+        }
+
+        const string SEPARATOR = "/";
+        const string ESCAPED_SEPARATOR = "\u200A\u2215\u200A";
+    }
+}
diff --git a/Editor/PlasticSCM/UI/UnityMenuItem.cs.meta b/Editor/PlasticSCM/UI/UnityMenuItem.cs.meta
new file mode 100644
index 0000000..571701b
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityMenuItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ad0c4895dbf7aeb459c1d136884a7998
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UnityPlasticGuiMessage.cs b/Editor/PlasticSCM/UI/UnityPlasticGuiMessage.cs
new file mode 100644
index 0000000..07adbb4
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityPlasticGuiMessage.cs
@@ -0,0 +1,157 @@
+using UnityEditor;
+
+using Codice.Client.Common;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class UnityPlasticGuiMessage : GuiMessage.IGuiMessage
+    {
+        internal UnityPlasticGuiMessage(EditorWindow parentWindow)
+        {
+            mParentWindow = parentWindow;
+        }
+
+        void GuiMessage.IGuiMessage.ShowMessage(
+            string title,
+            string message,
+            GuiMessage.GuiMessageType alertType)
+        {
+            EditorUtility.DisplayDialog(
+                BuildDialogTitle(title, alertType),
+                message,
+                PlasticLocalization.GetString(PlasticLocalization.Name.CloseButton));
+        }
+
+        void GuiMessage.IGuiMessage.ShowError(string message)
+        {
+            EditorUtility.DisplayDialog(
+                PlasticLocalization.GetString(PlasticLocalization.Name.ErrorPlasticSCM),
+                message,
+                PlasticLocalization.GetString(PlasticLocalization.Name.CloseButton));
+        }
+
+        GuiMessage.GuiMessageResponseButton GuiMessage.IGuiMessage.ShowQuestion(
+            string title,
+            string message,
+            string firstActionButton,
+            string secondActionButton,
+            string thirdActionButton,
+            bool isFirstButtonEnabled)
+        {
+            if (!isFirstButtonEnabled)
+            {
+                bool result = EditorUtility.DisplayDialog(
+                    title,
+                    message,
+                    secondActionButton,
+                    thirdActionButton);
+
+                return (result) ?
+                    GuiMessage.GuiMessageResponseButton.Second :
+                    GuiMessage.GuiMessageResponseButton.Third;
+            }
+
+            int intResult = EditorUtility.DisplayDialogComplex(
+                title,
+                message,
+                firstActionButton,
+                secondActionButton,
+                thirdActionButton);
+
+            return GetResponse(intResult);
+        }
+
+        bool GuiMessage.IGuiMessage.ShowQuestion(
+            string title,
+            string message,
+            string yesButton)
+        {
+            return EditorUtility.DisplayDialog(
+                title,
+                message,
+                yesButton,
+                PlasticLocalization.GetString(PlasticLocalization.Name.NoButton));
+        }
+
+        bool GuiMessage.IGuiMessage.ShowYesNoQuestion(string title, string message)
+        {
+            return EditorUtility.DisplayDialog(
+                title,
+                message,
+                PlasticLocalization.GetString(PlasticLocalization.Name.YesButton),
+                PlasticLocalization.GetString(PlasticLocalization.Name.NoButton));
+        }
+
+        GuiMessage.GuiMessageResponseButton GuiMessage.IGuiMessage.ShowYesNoCancelQuestion(
+            string title, string message)
+        {
+            int intResult = EditorUtility.DisplayDialogComplex(
+                title,
+                message,
+                PlasticLocalization.GetString(PlasticLocalization.Name.YesButton),
+                PlasticLocalization.GetString(PlasticLocalization.Name.NoButton),
+                PlasticLocalization.GetString(PlasticLocalization.Name.CancelButton));
+
+            return GetResponse(intResult);
+        }
+
+        bool GuiMessage.IGuiMessage.ShowYesNoQuestionWithType(
+            string title, string message, GuiMessage.GuiMessageType messageType)
+        {
+            return EditorUtility.DisplayDialog(
+                BuildDialogTitle(title, messageType),
+                message,
+                PlasticLocalization.GetString(PlasticLocalization.Name.YesButton),
+                PlasticLocalization.GetString(PlasticLocalization.Name.NoButton));
+        }
+
+        static GuiMessage.GuiMessageResponseButton GetResponse(int dialogResult)
+        {
+            switch (dialogResult)
+            {
+                case 0:
+                    return GuiMessage.GuiMessageResponseButton.First;
+                case 1:
+                    return GuiMessage.GuiMessageResponseButton.Second;
+                case 2:
+                    return GuiMessage.GuiMessageResponseButton.Third;
+                default:
+                    return GuiMessage.GuiMessageResponseButton.Second;
+            }
+        }
+
+        static string BuildDialogTitle(
+            string title,
+            GuiMessage.GuiMessageType alertType)
+        {
+            string alertTypeText = GetAlertTypeText(alertType);
+            return string.Format("{0} - {1}", alertTypeText, title);
+        }
+
+        static string GetAlertTypeText(GuiMessage.GuiMessageType alertType)
+        {
+            string alertTypeText = string.Empty;
+
+            switch (alertType)
+            {
+                case GuiMessage.GuiMessageType.Informational:
+                    alertTypeText = "Information";
+                    break;
+                case GuiMessage.GuiMessageType.Warning:
+                    alertTypeText = "Warning";
+                    break;
+                case GuiMessage.GuiMessageType.Critical:
+                    alertTypeText = "Error";
+                    break;
+                case GuiMessage.GuiMessageType.Question:
+                    alertTypeText = "Question";
+                    break;
+            }
+
+            return alertTypeText;
+        }
+
+        EditorWindow mParentWindow;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/UnityPlasticGuiMessage.cs.meta b/Editor/PlasticSCM/UI/UnityPlasticGuiMessage.cs.meta
new file mode 100644
index 0000000..3300718
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityPlasticGuiMessage.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ee61022c90cce0b49bb0e459b11ec2ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UnityPlasticTimer.cs b/Editor/PlasticSCM/UI/UnityPlasticTimer.cs
new file mode 100644
index 0000000..e7e57fb
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityPlasticTimer.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Timers;
+
+using Codice.Client.Common.Threading;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class UnityPlasticTimerBuilder : IPlasticTimerBuilder
+    {
+        IPlasticTimer IPlasticTimerBuilder.Get(bool bModalMode, ThreadWaiter.TimerTick timerTickDelegate)
+        {
+            return new UnityPlasticTimer(DEFAULT_TIMER_INTERVAL, timerTickDelegate);
+        }
+
+        IPlasticTimer IPlasticTimerBuilder.Get(bool bModalMode, int timerInterval, ThreadWaiter.TimerTick timerTickDelegate)
+        {
+            return new UnityPlasticTimer(timerInterval, timerTickDelegate);
+        }
+
+        const int DEFAULT_TIMER_INTERVAL = 100;
+    }
+
+    internal class UnityPlasticTimer : IPlasticTimer
+    {
+        internal UnityPlasticTimer(int timerInterval, ThreadWaiter.TimerTick timerTickDelegate)
+        {
+            mTimerInterval = timerInterval;
+            mTimerTickDelegate = timerTickDelegate;
+        }
+
+        void IPlasticTimer.Start()
+        {
+            mTimer = new Timer();
+            mTimer.Interval = mTimerInterval;
+            mTimer.Elapsed += OnTimerTick;
+
+            mTimer.Start();
+        }
+
+        void IPlasticTimer.Stop()
+        {
+            mTimer.Stop();
+            mTimer.Elapsed -= OnTimerTick;
+            mTimer.Dispose();
+        }
+
+        void OnTimerTick(object sender, EventArgs e)
+        {
+            mTimerTickDelegate();
+        }
+
+        Timer mTimer;
+        int mTimerInterval;
+        ThreadWaiter.TimerTick mTimerTickDelegate;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/UnityPlasticTimer.cs.meta b/Editor/PlasticSCM/UI/UnityPlasticTimer.cs.meta
new file mode 100644
index 0000000..9189968
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityPlasticTimer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 90a94ffd2947aab4d9da12dee0175a7a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UnityStyles.cs b/Editor/PlasticSCM/UI/UnityStyles.cs
new file mode 100644
index 0000000..514b9ba
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityStyles.cs
@@ -0,0 +1,671 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    // Assumption: Members are called from an OnGUI method ( otherwise style composition will fail)
+    internal static class UnityStyles
+    {
+        internal static void Initialize(
+            Action repaintPlasticWindow)
+        {
+            mRepaintPlasticWindow = repaintPlasticWindow;
+
+            mLazyBackgroundStyles.Add(WarningMessage);
+            mLazyBackgroundStyles.Add(SplitterIndicator);
+            mLazyBackgroundStyles.Add(PlasticWindow.ActiveTabUnderline);
+            mLazyBackgroundStyles.Add(Notification.GreenNotification);
+            mLazyBackgroundStyles.Add(Notification.RedNotification);
+            mLazyBackgroundStyles.Add(CancelButton);
+            mLazyBackgroundStyles.Add(Inspector.HeaderBackgroundStyle);
+            mLazyBackgroundStyles.Add(Inspector.DisabledHeaderBackgroundStyle);
+        }
+
+        internal static class Colors
+        {
+            internal static Color Transparent = new Color(255f / 255, 255f / 255, 255f / 255, 0f / 255);
+            internal static Color GreenBackground = new Color(34f / 255, 161f / 255, 63f / 255);
+            internal static Color GreenText = new Color(0f / 255, 100f / 255, 0f / 255);
+            internal static Color Red = new Color(194f / 255, 51f / 255, 62f / 255);
+            internal static Color Warning = new Color(255f / 255, 255f / 255, 176f / 255);
+            internal static Color Splitter = new Color(100f / 255, 100f / 255, 100f / 255);
+#if UNITY_2019
+            internal static Color InspectorHeaderBackground = (EditorGUIUtility.isProSkin) ?
+                new Color(60f / 255, 60f / 255, 60f / 255) :
+                new Color(203f / 255, 203f / 255, 203f / 255);
+#else
+            internal static Color InspectorHeaderBackground = Transparent;
+#endif
+#if UNITY_2019_1_OR_NEWER
+            internal static Color InspectorHeaderBackgroundDisabled = (EditorGUIUtility.isProSkin) ?
+                new Color(58f / 255, 58f / 255, 58f / 255) :
+                new Color(199f / 255, 199f / 255, 199f / 255);
+#else
+            internal static Color InspectorHeaderBackgroundDisabled = (EditorGUIUtility.isProSkin) ?
+                new Color(60f / 255, 60f / 255, 60f / 255) :
+                new Color(210f / 255, 210f / 255, 210f / 255);
+#endif
+            internal static Color TabUnderline = new Color(0.128f, 0.456f, 0.776f);
+            internal static Color Link = new Color(0f, 120f / 255, 218f / 255);
+            internal static Color SecondaryLabel = (EditorGUIUtility.isProSkin) ?
+                new Color(135f / 255, 135f / 255, 135f / 255) :
+                new Color(105f / 255, 105f / 255, 105f / 255);
+        }
+
+        internal static class HexColors
+        {
+            internal const string LINK_COLOR = "#0078DA";
+        }
+
+        internal static class Dialog
+        {
+
+            internal static readonly LazyStyle MessageTitle = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.boldLabel);
+                style.contentOffset = new Vector2(0, -5);
+                style.wordWrap = true;
+                style.fontSize = MODAL_FONT_SIZE + 1;
+                return style;
+            });
+
+            internal static readonly LazyStyle MessageText = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.wordWrap = true;
+                style.fontSize = MODAL_FONT_SIZE;
+                return style;
+            });
+
+
+            internal static readonly LazyStyle Toggle = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.boldLabel);
+                style.fontSize = MODAL_FONT_SIZE;
+                style.clipping = TextClipping.Overflow;
+                return style;
+            });
+
+            internal static readonly LazyStyle RadioToggle = new LazyStyle(() =>
+            {
+                var radioToggleStyle = new GUIStyle(EditorStyles.radioButton);
+                radioToggleStyle.fontSize = MODAL_FONT_SIZE;
+                radioToggleStyle.clipping = TextClipping.Overflow;
+                radioToggleStyle.font = EditorStyles.largeLabel.font;
+                return radioToggleStyle;
+            });
+
+            internal static readonly LazyStyle Foldout = new LazyStyle(() =>
+            {
+                GUIStyle paragraphStyle = Paragraph;
+                var foldoutStyle = new GUIStyle(EditorStyles.foldout);
+                foldoutStyle.fontSize = MODAL_FONT_SIZE;
+                foldoutStyle.font = paragraphStyle.font;
+                return foldoutStyle;
+            });
+
+            internal static readonly LazyStyle EntryLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.textField);
+                style.wordWrap = true;
+                style.fontSize = MODAL_FONT_SIZE;
+                return style;
+            });
+
+            internal static readonly LazyStyle AcceptButtonText = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(GetEditorSkin().GetStyle("WhiteLabel"));
+                style.alignment = TextAnchor.MiddleCenter;
+                style.fontSize = MODAL_FONT_SIZE + 1;
+                style.normal.background = null;
+                return style;
+            });
+
+            internal static readonly LazyStyle NormalButton = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(GetEditorSkin().button);
+                style.alignment = TextAnchor.MiddleCenter;
+                style.fontSize = MODAL_FONT_SIZE;
+                return style;
+            });
+        }
+
+        internal static class Tree
+        {
+            internal static readonly LazyStyle IconStyle = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.largeLabel);
+                style.alignment = TextAnchor.MiddleLeft;
+                return style;
+            });
+
+            internal static readonly LazyStyle Label = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(TreeView.DefaultStyles.label);
+                style.fontSize = 11;
+                style.alignment = TextAnchor.MiddleLeft;
+                return style;
+            });
+
+            internal static readonly LazyStyle SecondaryLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(TreeView.DefaultStyles.label);
+                style.fontSize = 11;
+                style.alignment = TextAnchor.MiddleLeft;
+
+                style.active = new GUIStyleState() { textColor = Colors.SecondaryLabel };
+                style.focused = new GUIStyleState() { textColor = Colors.SecondaryLabel };
+                style.hover = new GUIStyleState() { textColor = Colors.SecondaryLabel };
+                style.normal = new GUIStyleState() { textColor = Colors.SecondaryLabel };
+
+                return style;
+            });
+
+            internal static readonly LazyStyle SecondaryBoldLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(SecondaryLabel);
+                style.fontStyle = FontStyle.Bold;
+                return style;
+            });
+
+            internal static readonly LazyStyle RedLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(Label);
+                style.active = new GUIStyleState() { textColor = Colors.Red };
+                style.focused = new GUIStyleState() { textColor = Colors.Red };
+                style.hover = new GUIStyleState() { textColor = Colors.Red };
+                style.normal = new GUIStyleState() { textColor = Colors.Red };
+                return style;
+            });
+
+            internal static readonly LazyStyle GreenLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(Label);
+                style.active = new GUIStyleState() { textColor = Colors.GreenText };
+                style.focused = new GUIStyleState() { textColor = Colors.GreenText };
+                style.hover = new GUIStyleState() { textColor = Colors.GreenText };
+                style.normal = new GUIStyleState() { textColor = Colors.GreenText };
+                return style;
+            });
+
+            internal static readonly LazyStyle BoldLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(TreeView.DefaultStyles.boldLabel);
+                style.fontSize = 11;
+                style.alignment = TextAnchor.MiddleLeft;
+                return style;
+            });
+
+            internal static readonly LazyStyle LabelRightAligned = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(TreeView.DefaultStyles.label);
+                style.fontSize = 11;
+                style.alignment = TextAnchor.MiddleRight;
+                return style;
+            });
+
+            internal static readonly LazyStyle SecondaryLabelRightAligned = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(SecondaryLabel);
+                style.alignment = TextAnchor.MiddleRight;
+                return style;
+            });
+
+            internal static readonly LazyStyle SecondaryLabelBoldRightAligned = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(SecondaryLabelRightAligned);
+                style.fontStyle = FontStyle.Bold;
+                return style;
+            });
+        }
+
+        public static class Inspector
+        {
+            public static readonly LazyStyle HeaderBackgroundStyle = new LazyStyle(() =>
+            {
+                return CreateUnderlineStyle(
+                    Colors.InspectorHeaderBackground,
+                    UnityConstants.INSPECTOR_ACTIONS_HEADER_BACK_RECTANGLE_HEIGHT);
+            });
+
+            public static readonly LazyStyle DisabledHeaderBackgroundStyle = new LazyStyle(() =>
+            {
+                return CreateUnderlineStyle(
+                    Colors.InspectorHeaderBackgroundDisabled,
+                    UnityConstants.INSPECTOR_ACTIONS_HEADER_BACK_RECTANGLE_HEIGHT);
+            });
+        }
+
+        internal static class PlasticWindow
+        {
+            internal static readonly LazyStyle HeaderTitleLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                return style;
+            });
+
+            internal static readonly LazyStyle ActiveTabButton = new LazyStyle(() =>
+            {
+                GUIStyle result = new GUIStyle(EditorStyles.toolbarButton);
+                result.fontStyle = FontStyle.Bold;
+                return result;
+            });
+
+            internal static readonly LazyStyle ActiveTabUnderline = new LazyStyle(() =>
+            {
+                return CreateUnderlineStyle(
+                    Colors.TabUnderline,
+                    UnityConstants.ACTIVE_TAB_UNDERLINE_HEIGHT);
+            });
+        }
+
+        internal static class DiffPanel
+        {
+            internal static readonly LazyStyle HeaderLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.fontSize = 10;
+                style.fontStyle = FontStyle.Bold;
+#if UNITY_2019_1_OR_NEWER
+                style.contentOffset = new Vector2(0, 1.5f);
+#endif
+                return style;
+            });
+        }
+
+        internal static class PendingChangesTab
+        {
+            internal static readonly LazyStyle CommentPlaceHolder = new LazyStyle(() =>
+            {
+                var style = new GUIStyle();
+                style.normal = new GUIStyleState() { textColor = Color.gray };
+                style.padding = new RectOffset(2, 0, 0, 0);
+                return style;
+            });
+
+            internal static readonly LazyStyle CommentTextArea = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.textArea);
+                style.margin = new RectOffset(6, 4, 0, 0);
+                return style;
+            });
+
+            internal static readonly LazyStyle CommentWarningIcon = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.fontSize = 10;
+#if !UNITY_2019_1_OR_NEWER
+                style.margin = new RectOffset(0, 0, 0, 0);
+#endif
+                return style;
+            });
+
+            internal static readonly LazyStyle HeaderLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.fontSize = 10;
+                style.fontStyle = FontStyle.Bold;
+#if UNITY_2019_1_OR_NEWER
+                style.contentOffset = new Vector2(0, 1.5f);
+#endif
+                return style;
+            });
+        }
+
+        internal static class IncomingChangesTab
+        {
+            internal static readonly LazyStyle PendingConflictsLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.fontSize = 10;
+                style.fontStyle = FontStyle.Bold;
+                return style;
+            });
+
+            internal static readonly LazyStyle RedPendingConflictsOfTotalLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(PendingConflictsLabel);
+                style.normal = new GUIStyleState() { textColor = Colors.Red };
+                return style;
+            });
+
+            internal static readonly LazyStyle GreenPendingConflictsOfTotalLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(PendingConflictsLabel);
+                style.normal = new GUIStyleState() { textColor = Colors.GreenText };
+                return style;
+            });
+
+            internal static readonly LazyStyle ChangesToApplySummaryLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.fontSize = 10;
+                return style;
+            });
+
+            internal readonly static LazyStyle HeaderWarningLabel
+                = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.fontSize = 10;
+#if !UNITY_2019_1_OR_NEWER
+                style.margin = new RectOffset(0, 0, 0, 0);
+#endif
+                return style;
+            });
+        }
+
+        internal static class ChangesetsTab
+        {
+            internal static readonly LazyStyle HeaderLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.fontSize = 10;
+                style.fontStyle = FontStyle.Bold;
+#if UNITY_2019_1_OR_NEWER
+                style.contentOffset = new Vector2(0, 1.5f);
+#endif
+                return style;
+            });
+        }
+
+        internal static class HistoryTab
+        {
+            internal static readonly LazyStyle HeaderLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.fontSize = 10;
+                style.fontStyle = FontStyle.Bold;
+#if UNITY_2019_1_OR_NEWER
+                style.contentOffset = new Vector2(0, 1.5f);
+#endif
+                return style;
+            });
+        }
+
+        internal static class DirectoryConflictResolution
+        {
+            internal readonly static LazyStyle WarningLabel
+                = new LazyStyle(() =>
+                {
+                    var style = new GUIStyle(EditorStyles.label);
+                    style.alignment = TextAnchor.MiddleLeft;
+#if !UNITY_2019_1_OR_NEWER
+                    style.margin = new RectOffset(0, 0, 0, 0);
+#endif
+                    return style;
+                });
+        }
+
+        internal static class Notification
+        {
+            internal static readonly LazyStyle Label = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+#if !UNITY_2019_1_OR_NEWER
+                style.fontSize = 10;
+#endif
+                style.normal = new GUIStyleState() { textColor = Color.white };
+                return style;
+            });
+
+            internal static readonly LazyStyle GreenNotification = new LazyStyle(() =>
+            {
+                var style = new GUIStyle();
+                style.wordWrap = true;
+                style.margin = new RectOffset();
+                style.padding = new RectOffset(4, 4, 2, 2);
+                style.stretchWidth = true;
+                style.stretchHeight = true;
+                style.alignment = TextAnchor.UpperLeft;
+
+                var bg = new Texture2D(1, 1);
+                bg.SetPixel(0, 0, Colors.GreenBackground);
+                bg.Apply();
+                style.normal.background = bg;
+                return style;
+            });
+
+            internal static readonly LazyStyle RedNotification = new LazyStyle(() =>
+            {
+                var style = new GUIStyle();
+                style.wordWrap = true;
+                style.margin = new RectOffset();
+                style.padding = new RectOffset(4, 4, 2, 2);
+                style.stretchWidth = true;
+                style.stretchHeight = true;
+                style.alignment = TextAnchor.UpperLeft;
+
+                var bg = new Texture2D(1, 1);
+                bg.SetPixel(0, 0, Colors.Red);
+                bg.Apply();
+                style.normal.background = bg;
+                return style;
+            });
+        }
+
+        internal static class DirectoryConflicts
+        {
+            internal readonly static LazyStyle TitleLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.largeLabel);
+                RectOffset margin = new RectOffset(
+                    style.margin.left,
+                    style.margin.right,
+                    style.margin.top - 1,
+                    style.margin.bottom);
+                style.margin = margin;
+                style.fontStyle = FontStyle.Bold;
+                return style;
+            });
+
+            internal readonly static LazyStyle BoldLabel = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.label);
+                style.fontStyle = FontStyle.Bold;
+                return style;
+            });
+
+            internal readonly static LazyStyle FileNameTextField = new LazyStyle(() =>
+            {
+                var style = new GUIStyle(EditorStyles.textField);
+                RectOffset margin = new RectOffset(
+                    style.margin.left,
+                    style.margin.right,
+                    style.margin.top + 2,
+                    style.margin.bottom);
+                style.margin = margin;
+                return style;
+            });
+        }
+
+        internal static readonly LazyStyle SplitterIndicator = new LazyStyle(() =>
+        {
+            return CreateUnderlineStyle(
+                Colors.Splitter,
+                UnityConstants.SPLITTER_INDICATOR_HEIGHT);
+        });
+
+        internal static readonly LazyStyle HelpBoxLabel = new LazyStyle(() =>
+        {
+            var style = new GUIStyle(EditorStyles.label);
+            style.fontSize = 10;
+            style.wordWrap = true;
+            return style;
+        });
+
+        internal static readonly LazyStyle ProgressLabel = new LazyStyle(() =>
+        {
+            var style = new GUIStyle(EditorStyles.label);
+            style.fontSize = 10;
+#if !UNITY_2019_1_OR_NEWER
+            style.margin = new RectOffset(0, 0, 0, 0);
+#endif
+            return style;
+        });
+
+        internal static readonly LazyStyle TextFieldWithWrapping = new LazyStyle(() =>
+        {
+            var style = new GUIStyle(EditorStyles.textField);
+            style.wordWrap = true;
+            return style;
+        });
+
+        internal static readonly LazyStyle Search = new LazyStyle(() =>
+        {
+            var style = new GUIStyle();
+            style.normal = new GUIStyleState() { textColor = Color.gray };
+            style.padding = new RectOffset(18, 0, 0, 0);
+            return style;
+        });
+
+        internal static readonly LazyStyle WarningMessage = new LazyStyle(() =>
+        {
+            var style = new GUIStyle(GetEditorSkin().box);
+            style.wordWrap = true;
+            style.margin = new RectOffset();
+            style.padding = new RectOffset(8, 8, 6, 6);
+            style.stretchWidth = true;
+            style.alignment = TextAnchor.UpperLeft;
+
+            var bg = new Texture2D(1, 1);
+            bg.SetPixel(0, 0, Colors.Warning);
+            bg.Apply();
+            style.normal.background = bg;
+            return style;
+        });
+
+        internal static readonly LazyStyle CancelButton = new LazyStyle(() =>
+        {
+            var normalIcon = Images.GetImage(Images.Name.IconCloseButton);
+            var pressedIcon = Images.GetImage(Images.Name.IconPressedCloseButton);
+
+            var style = new GUIStyle();
+            style.normal = new GUIStyleState() { background = normalIcon };
+            style.onActive = new GUIStyleState() { background = pressedIcon };
+            style.active = new GUIStyleState() { background = pressedIcon };
+            return style;
+        });
+
+        internal static readonly LazyStyle MiniToggle = new LazyStyle(() =>
+        {
+            var style = new GUIStyle(EditorStyles.boldLabel);
+            style.fontSize = MODAL_FONT_SIZE - 1;
+            style.clipping = TextClipping.Overflow;
+            return style;
+        });
+
+        internal static readonly LazyStyle Paragraph = new LazyStyle(() =>
+        {
+            var style = new GUIStyle(EditorStyles.largeLabel);
+            style.wordWrap = true;
+            style.richText = true;
+            style.fontSize = MODAL_FONT_SIZE;
+            return style;
+        });
+
+        static GUISkin GetEditorSkin()
+        {
+            GUISkin editorSkin = null;
+            if (EditorGUIUtility.isProSkin)
+                editorSkin = EditorGUIUtility.GetBuiltinSkin(EditorSkin.Scene);
+            else
+                editorSkin = EditorGUIUtility.GetBuiltinSkin(EditorSkin.Inspector);
+
+            return editorSkin;
+        }
+
+        static GUIStyle CreateUnderlineStyle(Color color, int height)
+        {
+            GUIStyle style = new GUIStyle();
+
+            Texture2D pixel = new Texture2D(1, height);
+
+            for (int i = 0; i < height; i++)
+                pixel.SetPixel(0, i, color);
+
+            pixel.wrapMode = TextureWrapMode.Repeat;
+            pixel.Apply();
+
+            style.normal.background = pixel;
+            style.fixedHeight = height;
+
+            return style;
+        }
+
+        static void EnsureBackgroundStyles(LazyStyle lazy)
+        {
+            // The editor cleans the GUIStyleState.background property
+            // when entering the edit mode (exiting the play mode)
+            // and also in other situations (e.g when you use Zoom app)
+            // Because of this, we have to reset them in order to
+            // re-instantiate them the next time they're used
+
+            if (!mLazyBackgroundStyles.Contains(lazy))
+                return;
+
+            bool needsRepaint = false;
+
+            foreach (LazyStyle style in mLazyBackgroundStyles)
+            {
+                if (!style.IsInitialized)
+                    continue;
+
+                if (style.Value.normal.background != null)
+                    continue;
+
+                style.Reset();
+
+                needsRepaint = true;
+            }
+
+            if (!needsRepaint)
+                return;
+
+            if (mRepaintPlasticWindow != null)
+                mRepaintPlasticWindow();
+        }
+
+        static List<LazyStyle> mLazyBackgroundStyles = new List<LazyStyle>();
+
+        internal class LazyStyle
+        {
+            internal bool IsInitialized { get; private set; }
+
+            internal LazyStyle(Func<GUIStyle> builder)
+            {
+                mBuilder = builder;
+                IsInitialized = false;
+            }
+            internal GUIStyle Value { get; private set; }
+
+            internal void Reset()
+            {
+                IsInitialized = false;
+            }
+
+            public static implicit operator GUIStyle(LazyStyle lazy)
+            {
+                if (lazy.IsInitialized)
+                {
+                    EnsureBackgroundStyles(lazy);
+                    return lazy.Value;
+                }
+
+                lazy.Value = lazy.mBuilder();
+                lazy.IsInitialized = true;
+                return lazy.Value;
+            }
+
+            readonly Func<GUIStyle> mBuilder;
+        }
+
+        static Action mRepaintPlasticWindow;
+
+        const int MODAL_FONT_SIZE = 13;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/UnityStyles.cs.meta b/Editor/PlasticSCM/UI/UnityStyles.cs.meta
new file mode 100644
index 0000000..91a4ed8
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityStyles.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 0a3ad267026374439be70d4b4cd3d4f7
+timeCreated: 1542796036
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UI/UnityThreadWaiter.cs b/Editor/PlasticSCM/UI/UnityThreadWaiter.cs
new file mode 100644
index 0000000..b53c2df
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityThreadWaiter.cs
@@ -0,0 +1,107 @@
+using System;
+
+using Codice.Client.Common.Threading;
+
+namespace Unity.PlasticSCM.Editor.UI
+{
+    internal class UnityThreadWaiterBuilder : IThreadWaiterBuilder
+    {
+        IThreadWaiter IThreadWaiterBuilder.GetWaiter()
+        {
+            return new UnityThreadWaiter(mPlasticTimerBuilder, false);
+        }
+
+        IThreadWaiter IThreadWaiterBuilder.GetWaiter(int timerIntervalMilliseconds)
+        {
+            return new UnityThreadWaiter(mPlasticTimerBuilder, false, timerIntervalMilliseconds);
+        }
+
+        IThreadWaiter IThreadWaiterBuilder.GetModalWaiter()
+        {
+            return new UnityThreadWaiter(mPlasticTimerBuilder, true);
+        }
+
+        IThreadWaiter IThreadWaiterBuilder.GetModalWaiter(int timerIntervalMilliseconds)
+        {
+            return new UnityThreadWaiter(mPlasticTimerBuilder, true, timerIntervalMilliseconds);
+        }
+
+        IPlasticTimer IThreadWaiterBuilder.GetTimer(
+            int timerIntervalMilliseconds, ThreadWaiter.TimerTick timerTickDelegate)
+        {
+            return mPlasticTimerBuilder.Get(false, timerIntervalMilliseconds, timerTickDelegate);
+        }
+
+        static IPlasticTimerBuilder mPlasticTimerBuilder = new UnityPlasticTimerBuilder();
+    }
+
+    internal class UnityThreadWaiter : IThreadWaiter
+    {
+        Exception IThreadWaiter.Exception { get { return mThreadOperation.Exception; } }
+
+        internal UnityThreadWaiter(
+            IPlasticTimerBuilder timerBuilder, bool bModalMode)
+        {
+            mPlasticTimer = timerBuilder.Get(bModalMode, OnTimerTick);
+        }
+
+        internal UnityThreadWaiter(
+            IPlasticTimerBuilder timerBuilder,
+            bool bModalMode,
+            int timerIntervalMilliseconds)
+        {
+            mPlasticTimer = timerBuilder.Get(bModalMode, timerIntervalMilliseconds, OnTimerTick);
+        }
+
+        void IThreadWaiter.Execute(
+            PlasticThread.Operation threadOperationDelegate,
+            PlasticThread.Operation afterOperationDelegate)
+        {
+            ((IThreadWaiter)(this)).Execute(threadOperationDelegate, afterOperationDelegate, null);
+        }
+
+        void IThreadWaiter.Execute(
+            PlasticThread.Operation threadOperationDelegate,
+            PlasticThread.Operation afterOperationDelegate,
+            PlasticThread.Operation timerTickDelegate)
+        {
+            mThreadOperation = new PlasticThread(threadOperationDelegate);
+            mAfterOperationDelegate = afterOperationDelegate;
+            mTimerTickDelegate = timerTickDelegate;
+
+            mPlasticTimer.Start();
+
+            mThreadOperation.Execute();
+        }
+
+        void IThreadWaiter.Cancel()
+        {
+            mbCancelled = true;
+        }
+
+        void OnTimerTick()
+        {
+            if (mThreadOperation.IsRunning)
+            {
+                if (mTimerTickDelegate != null)
+                    EditorDispatcher.Dispatch(() => mTimerTickDelegate());
+
+                return;
+            }
+
+            mPlasticTimer.Stop();
+
+            if (mbCancelled)
+                return;
+
+            EditorDispatcher.Dispatch(() => mAfterOperationDelegate());
+        }
+
+        bool mbCancelled = false;
+
+        IPlasticTimer mPlasticTimer;
+        PlasticThread mThreadOperation;
+        PlasticThread.Operation mTimerTickDelegate;
+        PlasticThread.Operation mAfterOperationDelegate;
+    }
+}
diff --git a/Editor/PlasticSCM/UI/UnityThreadWaiter.cs.meta b/Editor/PlasticSCM/UI/UnityThreadWaiter.cs.meta
new file mode 100644
index 0000000..27a29f1
--- /dev/null
+++ b/Editor/PlasticSCM/UI/UnityThreadWaiter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 83e946775d0516c4aba77860a60ed6e6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Unity.PlasticSCM.Editor.asmdef b/Editor/PlasticSCM/Unity.PlasticSCM.Editor.asmdef
new file mode 100644
index 0000000..f1c35ff
--- /dev/null
+++ b/Editor/PlasticSCM/Unity.PlasticSCM.Editor.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "Unity.PlasticSCM.Editor",
+    "references": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "Newtonsoft.Json.dll",
+        "unityplastic.dll"
+    ],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Unity.PlasticSCM.Editor.asmdef.meta b/Editor/PlasticSCM/Unity.PlasticSCM.Editor.asmdef.meta
new file mode 100644
index 0000000..acde12c
--- /dev/null
+++ b/Editor/PlasticSCM/Unity.PlasticSCM.Editor.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4b84427fd7ace4b4cb623ef8a46124ed
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/UnityConfigurationChecker.cs b/Editor/PlasticSCM/UnityConfigurationChecker.cs
new file mode 100644
index 0000000..8b96945
--- /dev/null
+++ b/Editor/PlasticSCM/UnityConfigurationChecker.cs
@@ -0,0 +1,95 @@
+using System;
+using System.IO;
+
+using Codice.Client.Common;
+using Codice.Utils;
+using Unity.PlasticSCM.Editor.Tool;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class UnityConfigurationChecker
+    {
+        internal static bool NeedsConfiguration()
+        {
+            string plasticClientBinDir = PlasticInstallPath.GetClientBinDir();
+
+            if (string.IsNullOrEmpty(plasticClientBinDir))
+                return true;
+
+            SetupUnityEditionToken.FromPlasticInstallation(plasticClientBinDir);
+
+            return ConfigurationChecker.NeedConfiguration();
+        }
+    }
+
+    internal static class SetupUnityEditionToken
+    {
+        internal static void CreateCloudEditionTokenIfNeeded()
+        {
+            string toolPath = PlasticInstallPath.GetPlasticExePath();
+
+            if (!string.IsNullOrEmpty(toolPath))
+                return;
+
+            string tokenFilePath = UserConfigFolder.GetConfigFile(
+                EditionToken.CLOUD_EDITION_FILE_NAME);
+
+            File.Create(tokenFilePath).Dispose();
+        }
+
+        internal static void FromPlasticInstallation(string plasticClientBinDir)
+        {
+            bool isCloudPlasticInstall = IsPlasticInstallOfEdition(
+                plasticClientBinDir,
+                EditionToken.CLOUD_EDITION_FILE_NAME);
+
+            bool isDvcsPlasticInstall = IsPlasticInstallOfEdition(
+                plasticClientBinDir,
+                EditionToken.DVCS_EDITION_FILE_NAME);
+
+            SetupTokenFiles(
+                isCloudPlasticInstall,
+                isDvcsPlasticInstall);
+        }
+
+        static void SetupTokenFiles(
+            bool isCloudPlasticInstall,
+            bool isDvcsPlasticInstall)
+        {
+            string unityCloudEditionTokenFile = UserConfigFolder.GetConfigFile(
+                EditionToken.CLOUD_EDITION_FILE_NAME);
+
+            string unityDvcsEditionTokenFile = UserConfigFolder.GetConfigFile(
+                EditionToken.DVCS_EDITION_FILE_NAME);
+
+            CreateOrDeleteTokenFile(isCloudPlasticInstall, unityCloudEditionTokenFile);
+            CreateOrDeleteTokenFile(isDvcsPlasticInstall, unityDvcsEditionTokenFile);
+        }
+
+        static void CreateOrDeleteTokenFile(bool isEdition, string editionTokenFile)
+        {
+            if (isEdition && !File.Exists(editionTokenFile))
+            {
+                File.Create(editionTokenFile).Dispose();
+
+                return;
+            }
+
+            if (!isEdition && File.Exists(editionTokenFile))
+            {
+                File.Delete(editionTokenFile);
+
+                return;
+            }
+        }
+
+        static bool IsPlasticInstallOfEdition(
+            string plasticClientBinDir,
+            string editionFileName)
+        {
+            return File.Exists(Path.Combine(
+                plasticClientBinDir,
+                editionFileName));
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/UnityConfigurationChecker.cs.meta b/Editor/PlasticSCM/UnityConfigurationChecker.cs.meta
new file mode 100644
index 0000000..95c136e
--- /dev/null
+++ b/Editor/PlasticSCM/UnityConfigurationChecker.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1dc96db8ece508c4696f7e89c2cd11e3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/VCSPlugin.cs b/Editor/PlasticSCM/VCSPlugin.cs
new file mode 100644
index 0000000..ddadc00
--- /dev/null
+++ b/Editor/PlasticSCM/VCSPlugin.cs
@@ -0,0 +1,37 @@
+using UnityEditor;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal static class VCSPlugin
+    {
+        internal static bool IsEnabled()
+        {
+            return GetVersionControl() == "PlasticSCM";
+        }
+
+        internal static void Disable()
+        {
+            SetVersionControl("Visible Meta Files");
+
+            AssetDatabase.SaveAssets();
+        }
+
+        static string GetVersionControl()
+        {
+#if UNITY_2020_1_OR_NEWER
+            return VersionControlSettings.mode;
+#else
+            return EditorSettings.externalVersionControl;
+#endif
+        }
+
+        static void SetVersionControl(string versionControl)
+        {
+#if UNITY_2020_1_OR_NEWER
+            VersionControlSettings.mode = versionControl;
+#else
+            EditorSettings.externalVersionControl = versionControl;
+#endif
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/VCSPlugin.cs.meta b/Editor/PlasticSCM/VCSPlugin.cs.meta
new file mode 100644
index 0000000..e9ce69e
--- /dev/null
+++ b/Editor/PlasticSCM/VCSPlugin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7aad121cec1867b4493b3b31bc5c8a26
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/ViewSwitcher.cs b/Editor/PlasticSCM/ViewSwitcher.cs
new file mode 100644
index 0000000..d1d0f98
--- /dev/null
+++ b/Editor/PlasticSCM/ViewSwitcher.cs
@@ -0,0 +1,562 @@
+using System;
+
+using UnityEditor;
+
+using Codice.CM.Common;
+using GluonGui;
+using PlasticGui;
+using PlasticGui.Gluon;
+using PlasticGui.WorkspaceWindow;
+using PlasticGui.WorkspaceWindow.Merge;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.AssetUtils.Processor;
+using Unity.PlasticSCM.Editor.Tool;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.Views.Changesets;
+using Unity.PlasticSCM.Editor.Views.History;
+using Unity.PlasticSCM.Editor.Views.IncomingChanges;
+using Unity.PlasticSCM.Editor.Views.PendingChanges;
+
+using GluonNewIncomingChangesUpdater = PlasticGui.Gluon.WorkspaceWindow.NewIncomingChangesUpdater;
+using ObjectInfo = Codice.CM.Common.ObjectInfo;
+
+namespace Unity.PlasticSCM.Editor
+{
+    internal class ViewSwitcher :
+        IViewSwitcher,
+        IMergeViewLauncher,
+        IGluonViewSwitcher,
+        IHistoryViewLauncher
+    {
+        internal PendingChangesTab PendingChangesTabForTesting { get { return mPendingChangesTab; } }
+        internal IIncomingChangesTab IncomingChangesTabForTesting { get { return mIncomingChangesTab; } }
+
+        internal ViewSwitcher(
+            WorkspaceInfo wkInfo,
+            ViewHost viewHost,
+            bool isGluonMode,
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges,
+            NewIncomingChangesUpdater developerNewIncomingChangesUpdater,
+            GluonNewIncomingChangesUpdater gluonNewIncomingChangesUpdater,
+            IIncomingChangesNotificationPanel incomingChangesNotificationPanel,
+            IAssetStatusCache assetStatusCache,
+            EditorWindow parentWindow)
+        {
+            mWkInfo = wkInfo;
+            mViewHost = viewHost;
+            mIsGluonMode = isGluonMode;
+            mPendingChanges = pendingChanges;
+            mDeveloperNewIncomingChangesUpdater = developerNewIncomingChangesUpdater;
+            mGluonNewIncomingChangesUpdater = gluonNewIncomingChangesUpdater;
+            mIncomingChangesNotificationPanel = incomingChangesNotificationPanel;
+            mAssetStatusCache = assetStatusCache;
+            mParentWindow = parentWindow;
+
+            mPendingChangesTabButton = new TabButton();
+            mIncomingChangesTabButton = new TabButton();
+            mChangesetsTabButton = new TabButton();
+            mHistoryTabButton = new TabButton();
+        }
+
+        internal void SetPlasticGUIClient(PlasticGUIClient plasticClient)
+        {
+            mPlasticClient = plasticClient;
+        }
+
+        internal void ShowInitialView()
+        {
+            ShowPendingChangesView();
+        }
+
+        internal void AutoRefreshPendingChangesView()
+        {
+            AutoRefresh.PendingChangesView(
+                mPendingChangesTab);
+        }
+
+        internal void AutoRefreshIncomingChangesView()
+        {
+            AutoRefresh.IncomingChangesView(
+                mIncomingChangesTab);
+        }
+
+        internal void RefreshView(ViewType viewType)
+        {
+            IRefreshableView view = GetRefreshableView(viewType);
+
+            if (view == null)
+                return;
+
+            view.Refresh();
+        }
+
+        internal void OnDisable()
+        {
+            PlasticAssetsProcessor.UnRegisterViews();
+
+            if (mPendingChangesTab != null)
+                mPendingChangesTab.OnDisable();
+
+            if (mIncomingChangesTab != null)
+                mIncomingChangesTab.OnDisable();
+
+            if (mChangesetsTab != null)
+                mChangesetsTab.OnDisable();
+
+            if (mHistoryTab != null)
+                mHistoryTab.OnDisable();
+        }
+
+        internal void Update()
+        {
+            if (IsViewSelected(SelectedTab.PendingChanges))
+            {
+                mPendingChangesTab.Update();
+                return;
+            }
+
+            if (IsViewSelected(SelectedTab.IncomingChanges))
+            {
+                mIncomingChangesTab.Update();
+                return;
+            }
+
+            if (IsViewSelected(SelectedTab.Changesets))
+            {
+                mChangesetsTab.Update();
+                return;
+            }
+
+            if (IsViewSelected(SelectedTab.History))
+            {
+                mHistoryTab.Update();
+                return;
+            }
+        }
+
+        internal void TabButtonsGUI()
+        {
+            InitializeTabButtonWidth();
+
+            PendingChangesTabButtonGUI();
+
+            IncomingChangesTabButtonGUI();
+
+            ChangesetsTabButtonGUI();
+
+            HistoryTabButtonGUI();
+        }
+
+        internal void TabViewGUI()
+        {
+            if (IsViewSelected(SelectedTab.PendingChanges))
+            {
+                mPendingChangesTab.OnGUI();
+                return;
+            }
+
+            if (IsViewSelected(SelectedTab.IncomingChanges))
+            {
+                mIncomingChangesTab.OnGUI();
+                return;
+            }
+
+            if (IsViewSelected(SelectedTab.Changesets))
+            {
+                mChangesetsTab.OnGUI();
+                return;
+            }
+
+            if (IsViewSelected(SelectedTab.History))
+            {
+                mHistoryTab.OnGUI();
+                return;
+            }
+        }
+
+        void IViewSwitcher.ShowPendingChanges()
+        {
+            ShowPendingChangesView();
+            mParentWindow.Repaint();
+        }
+
+        void IViewSwitcher.ShowSyncView(string syncViewToSelect)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IViewSwitcher.ShowBranchExplorerView()
+        {
+            //TODO: Codice
+            //launch plastic with branch explorer view option
+        }
+
+        void IViewSwitcher.DisableMergeView()
+        {
+        }
+
+        bool IViewSwitcher.IsIncomingChangesView()
+        {
+            return IsViewSelected(SelectedTab.IncomingChanges);
+        }
+
+        void IViewSwitcher.CloseIncomingChangesView()
+        {
+            ((IViewSwitcher)this).DisableMergeView();
+        }
+
+        void IMergeViewLauncher.MergeFrom(ObjectInfo objectInfo, EnumMergeType mergeType)
+        {
+            ((IMergeViewLauncher)this).MergeFromInterval(objectInfo, null, mergeType);
+        }
+
+        void IMergeViewLauncher.MergeFrom(ObjectInfo objectInfo, EnumMergeType mergeType, ShowIncomingChangesFrom from)
+        {
+            ((IMergeViewLauncher)this).MergeFromInterval(objectInfo, null, mergeType);
+        }
+
+        void IMergeViewLauncher.MergeFromInterval(ObjectInfo objectInfo, ObjectInfo ancestorChangesetInfo, EnumMergeType mergeType)
+        {
+            if (mergeType == EnumMergeType.IncomingMerge)
+            {
+                ShowIncomingChangesView();
+                mParentWindow.Repaint();
+                return;
+            }
+
+            LaunchTool.OpenMerge(mWkInfo.ClientPath);
+        }
+
+        void IGluonViewSwitcher.ShowIncomingChangesView()
+        {
+            ShowIncomingChangesView();
+            mParentWindow.Repaint();
+        }
+
+        void IHistoryViewLauncher.ShowHistoryView(
+            RepositorySpec repSpec,
+            long itemId,
+            string path,
+            bool isDirectory)
+        {
+            ShowHistoryView(
+                repSpec,
+                itemId,
+                path,
+                isDirectory);
+
+            mParentWindow.Repaint();
+        }
+
+        void CloseHistoryTab()
+        {
+            ShowView(mPreviousSelectedTab);
+
+            mViewHost.RemoveRefreshableView(
+                ViewType.HistoryView, mHistoryTab);
+
+            mHistoryTab.OnDisable();
+            mHistoryTab = null;
+
+            mParentWindow.Repaint();
+        }
+
+        void ShowPendingChangesView()
+        {
+            if (mPendingChangesTab == null)
+            {
+                mPendingChangesTab = new PendingChangesTab(
+                    mWkInfo,
+                    mPlasticClient,
+                    mIsGluonMode,
+                    mPendingChanges,
+                    mDeveloperNewIncomingChangesUpdater,
+                    this,
+                    mAssetStatusCache,
+                    mParentWindow);
+
+                mViewHost.AddRefreshableView(
+                    ViewType.CheckinView,
+                    mPendingChangesTab);
+
+                PlasticAssetsProcessor.
+                    RegisterPendingChangesView(mPendingChangesTab);
+            }
+
+            bool wasPendingChangesSelected =
+                IsViewSelected(SelectedTab.PendingChanges);
+
+            if (!wasPendingChangesSelected)
+            {
+                mPendingChangesTab.AutoRefresh();
+            }
+
+            SetSelectedView(SelectedTab.PendingChanges);
+        }
+
+        void ShowIncomingChangesView()
+        {
+            if (mIncomingChangesTab == null)
+            {
+                mIncomingChangesTab = mIsGluonMode ?
+                    new Views.IncomingChanges.Gluon.IncomingChangesTab(
+                        mWkInfo,
+                        mViewHost,
+                        mPlasticClient,
+                        mGluonNewIncomingChangesUpdater,
+                        (Gluon.IncomingChangesNotificationPanel)mIncomingChangesNotificationPanel,
+                        mParentWindow) as IIncomingChangesTab :
+                    new Views.IncomingChanges.Developer.IncomingChangesTab(
+                        mWkInfo,
+                        this,
+                        mPlasticClient,
+                        mDeveloperNewIncomingChangesUpdater,
+                        mParentWindow);
+
+                mViewHost.AddRefreshableView(
+                    ViewType.IncomingChangesView,
+                    (IRefreshableView)mIncomingChangesTab);
+
+                PlasticAssetsProcessor.
+                    RegisterIncomingChangesView(mIncomingChangesTab);
+            }
+
+            bool wasIncomingChangesSelected =
+                IsViewSelected(SelectedTab.IncomingChanges);
+
+            if (!wasIncomingChangesSelected)
+                mIncomingChangesTab.AutoRefresh();
+
+            SetSelectedView(SelectedTab.IncomingChanges);
+        }
+
+        void ShowChangesetsView()
+        {
+            if (mChangesetsTab == null)
+            {
+                mChangesetsTab = new ChangesetsTab(
+                    mWkInfo,
+                    mPlasticClient,
+                    this,
+                    this,
+                    mParentWindow,
+                    mIsGluonMode);
+
+                mViewHost.AddRefreshableView(
+                    ViewType.ChangesetsView,
+                    mChangesetsTab);
+            }
+
+            bool wasChangesetsSelected =
+                IsViewSelected(SelectedTab.Changesets);
+
+            if (!wasChangesetsSelected)
+                ((IRefreshableView)mChangesetsTab).Refresh();
+
+            SetSelectedView(SelectedTab.Changesets);
+        }
+
+        void ShowHistoryView(
+            RepositorySpec repSpec,
+            long itemId,
+            string path,
+            bool isDirectory)
+        {
+            if (mHistoryTab == null)
+            {
+                mHistoryTab = new HistoryTab(
+                    mWkInfo,
+                    mPlasticClient,
+                    repSpec,
+                    mDeveloperNewIncomingChangesUpdater,
+                    mViewHost,
+                    mParentWindow,
+                    mIsGluonMode);
+
+                mViewHost.AddRefreshableView(
+                    ViewType.HistoryView, mHistoryTab);
+            }
+
+            mHistoryTab.RefreshForItem(
+                itemId,
+                path,
+                isDirectory);
+
+            SetSelectedView(SelectedTab.History);
+        }
+
+        void InitializeTabButtonWidth()
+        {
+            if (mTabButtonWidth != -1)
+                return;
+
+            mTabButtonWidth = MeasureMaxWidth.ForTexts(
+                UnityStyles.PlasticWindow.ActiveTabButton,
+                PlasticLocalization.GetString(PlasticLocalization.Name.PendingChangesViewTitle),
+                PlasticLocalization.GetString(PlasticLocalization.Name.IncomingChangesViewTitle),
+                PlasticLocalization.GetString(PlasticLocalization.Name.ChangesetsViewTitle));
+        }
+
+        void ShowView(SelectedTab viewToShow)
+        {
+            switch (viewToShow)
+            {
+                case SelectedTab.PendingChanges:
+                    ShowPendingChangesView();
+                    break;
+                case SelectedTab.IncomingChanges:
+                    ShowIncomingChangesView();
+                    break;
+                case SelectedTab.Changesets:
+                    ShowChangesetsView();
+                    break;
+            }
+        }
+
+        IRefreshableView GetRefreshableView(ViewType viewType)
+        {
+            switch (viewType)
+            {
+                case ViewType.PendingChangesView:
+                    return mPendingChangesTab;
+                case ViewType.IncomingChangesView:
+                    return (IRefreshableView)mIncomingChangesTab;
+                case ViewType.ChangesetsView:
+                    return mChangesetsTab;
+                case ViewType.HistoryView:
+                    return mHistoryTab;
+                default:
+                    return null;
+            }
+        }
+
+        bool IsViewSelected(SelectedTab tab)
+        {
+            return mSelectedTab == tab;
+        }
+
+        void SetSelectedView(SelectedTab tab)
+        {
+            if (mSelectedTab != tab)
+                mPreviousSelectedTab = mSelectedTab;
+
+            mSelectedTab = tab;
+
+            if (mIncomingChangesTab == null)
+                return;
+
+            mIncomingChangesTab.IsVisible =
+                tab == SelectedTab.IncomingChanges;
+        }
+
+        void PendingChangesTabButtonGUI()
+        {
+            bool wasPendingChangesSelected =
+                IsViewSelected(SelectedTab.PendingChanges);
+
+            bool isPendingChangesSelected = mPendingChangesTabButton.
+                DrawTabButton(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.PendingChangesViewTitle),
+                    wasPendingChangesSelected,
+                    mTabButtonWidth);
+
+            if (isPendingChangesSelected)
+                ShowPendingChangesView();
+        }
+
+        void IncomingChangesTabButtonGUI()
+        {
+            bool wasIncomingChangesSelected =
+                IsViewSelected(SelectedTab.IncomingChanges);
+
+            bool isIncomingChangesSelected = mIncomingChangesTabButton.
+                DrawTabButton(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.IncomingChangesViewTitle),
+                    wasIncomingChangesSelected,
+                    mTabButtonWidth);
+
+            if (isIncomingChangesSelected)
+                ShowIncomingChangesView();
+        }
+
+        void ChangesetsTabButtonGUI()
+        {
+            bool wasChangesetsSelected =
+                IsViewSelected(SelectedTab.Changesets);
+
+            bool isChangesetsSelected = mChangesetsTabButton.
+                DrawTabButton(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ChangesetsViewTitle),
+                    wasChangesetsSelected,
+                    mTabButtonWidth);
+
+            if (isChangesetsSelected)
+                ShowChangesetsView();
+        }
+
+        void HistoryTabButtonGUI()
+        {
+            if (mHistoryTab == null)
+                return;
+
+            bool wasHistorySelected =
+                IsViewSelected(SelectedTab.History);
+
+            bool isCloseButtonClicked;
+
+            bool isHistorySelected = mHistoryTabButton.
+                DrawClosableTabButton(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.FileHistory),
+                    wasHistorySelected,
+                    true,
+                    mTabButtonWidth,
+                    mParentWindow.Repaint,
+                    out isCloseButtonClicked);
+
+            if (isCloseButtonClicked)
+            {
+                CloseHistoryTab();
+                return;
+            }
+
+            if (isHistorySelected)
+                SetSelectedView(SelectedTab.History);
+        }
+
+        enum SelectedTab
+        {
+            None = 0,
+            PendingChanges = 1,
+            IncomingChanges = 2,
+            Changesets = 3,
+            History = 4
+        }
+
+        PendingChangesTab mPendingChangesTab;
+        IIncomingChangesTab mIncomingChangesTab;
+        ChangesetsTab mChangesetsTab;
+        HistoryTab mHistoryTab;
+
+        SelectedTab mSelectedTab;
+        SelectedTab mPreviousSelectedTab;
+
+        float mTabButtonWidth = -1;
+
+        TabButton mPendingChangesTabButton;
+        TabButton mChangesetsTabButton;
+        TabButton mIncomingChangesTabButton;
+        TabButton mHistoryTabButton;
+
+        PlasticGUIClient mPlasticClient;
+
+        readonly EditorWindow mParentWindow;
+        readonly IAssetStatusCache mAssetStatusCache;
+        readonly IIncomingChangesNotificationPanel mIncomingChangesNotificationPanel;
+        readonly GluonNewIncomingChangesUpdater mGluonNewIncomingChangesUpdater;
+        readonly NewIncomingChangesUpdater mDeveloperNewIncomingChangesUpdater;
+        readonly PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges mPendingChanges;
+        readonly bool mIsGluonMode;
+        readonly ViewHost mViewHost;
+        readonly WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/ViewSwitcher.cs.meta b/Editor/PlasticSCM/ViewSwitcher.cs.meta
new file mode 100644
index 0000000..d3c72d3
--- /dev/null
+++ b/Editor/PlasticSCM/ViewSwitcher.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 896223e567b01c747b4726ef429e31ea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views.meta b/Editor/PlasticSCM/Views.meta
new file mode 100644
index 0000000..dedd23a
--- /dev/null
+++ b/Editor/PlasticSCM/Views.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 90e77543957de2e4dbe9d7d7c7653add
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Changesets.meta b/Editor/PlasticSCM/Views/Changesets.meta
new file mode 100644
index 0000000..5dbd804
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a83160f252281df4ebb018688dad5f08
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetListViewItem.cs b/Editor/PlasticSCM/Views/Changesets/ChangesetListViewItem.cs
new file mode 100644
index 0000000..3921570
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetListViewItem.cs
@@ -0,0 +1,17 @@
+using UnityEditor.IMGUI.Controls;
+
+namespace Unity.PlasticSCM.Editor.Views.Changesets
+{
+    class ChangesetListViewItem : TreeViewItem
+    {
+        internal object ObjectInfo { get; private set; }
+
+        internal ChangesetListViewItem(int id, object objectInfo)
+            : base(id, 1)
+        {
+            ObjectInfo = objectInfo;
+
+            displayName = id.ToString();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetListViewItem.cs.meta b/Editor/PlasticSCM/Views/Changesets/ChangesetListViewItem.cs.meta
new file mode 100644
index 0000000..d2d831c
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetListViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6000865ce7fbfc643abdd3d085b4422e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsListHeaderState.cs b/Editor/PlasticSCM/Views/Changesets/ChangesetsListHeaderState.cs
new file mode 100644
index 0000000..f5e8548
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsListHeaderState.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.Changesets
+{
+    internal enum ChangesetsListColumn
+    {
+        Name,
+        CreationDate,
+        CreatedBy,
+        Comment,
+        Branch,
+        Repository,
+        Guid
+    }
+
+    [Serializable]
+    internal class ChangesetsListHeaderState : MultiColumnHeaderState, ISerializationCallbackReceiver
+    {
+        internal static ChangesetsListHeaderState GetDefault()
+        {
+            return new ChangesetsListHeaderState(BuildColumns());
+        }
+
+        internal static List<string> GetColumnNames()
+        {
+            List<string> result = new List<string>();
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.NameColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.CreationDateColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.CreatedByColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.CommentColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.BranchColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.RepositoryColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.GuidColumn));
+            return result;
+        }
+
+        internal static string GetColumnName(ChangesetsListColumn column)
+        {
+            switch (column)
+            {
+                case ChangesetsListColumn.Name:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.NameColumn);
+                case ChangesetsListColumn.CreationDate:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.CreationDateColumn);
+                case ChangesetsListColumn.CreatedBy:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.CreatedByColumn);
+                case ChangesetsListColumn.Comment:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.CommentColumn);
+                case ChangesetsListColumn.Branch:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.BranchColumn);
+                case ChangesetsListColumn.Repository:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.RepositoryColumn);
+                case ChangesetsListColumn.Guid:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.GuidColumn);
+                default:
+                    return null;
+            }
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            if (mHeaderTitles != null)
+                TreeHeaderColumns.SetTitles(columns, mHeaderTitles);
+
+            if (mColumsAllowedToggleVisibility != null)
+                TreeHeaderColumns.SetVisibilities(columns, mColumsAllowedToggleVisibility);
+        }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+        }
+
+        static Column[] BuildColumns()
+        {
+            return new Column[]
+                {
+                    new Column()
+                    {
+                        width = UnityConstants.ChangesetsColumns.CHANGESET_NUMBER_WIDTH,
+                        minWidth = UnityConstants.ChangesetsColumns.CHANGESET_NUMBER_MIN_WIDTH,
+                        headerContent = new GUIContent(
+                            GetColumnName(ChangesetsListColumn.Name)),
+                        allowToggleVisibility = false
+                    },
+                    new Column()
+                    {
+                        width = UnityConstants.ChangesetsColumns.CREATION_DATE_WIDTH,
+                        minWidth = UnityConstants.ChangesetsColumns.CREATION_DATE_MIN_WIDTH,
+                        headerContent = new GUIContent(
+                            GetColumnName(ChangesetsListColumn.CreationDate))
+                    },
+                    new Column()
+                    {
+                        width = UnityConstants.ChangesetsColumns.CREATED_BY_WIDTH,
+                        minWidth = UnityConstants.ChangesetsColumns.CREATED_BY_MIN_WIDTH,
+                        headerContent = new GUIContent(
+                            GetColumnName(ChangesetsListColumn.CreatedBy))
+                    },
+                    new Column()
+                    {
+                        width = UnityConstants.ChangesetsColumns.COMMENT_WIDTH,
+                        minWidth = UnityConstants.ChangesetsColumns.COMMENT_MIN_WIDTH,
+                        headerContent = new GUIContent(
+                            GetColumnName(ChangesetsListColumn.Comment))
+                    },
+                    new Column()
+                    {
+                        width = UnityConstants.ChangesetsColumns.BRANCH_WIDTH,
+                        minWidth = UnityConstants.ChangesetsColumns.BRANCH_MIN_WIDTH,
+                        headerContent = new GUIContent(
+                            GetColumnName(ChangesetsListColumn.Branch))
+                    },
+                    new Column()
+                    {
+                        width = UnityConstants.ChangesetsColumns.REPOSITORY_WIDTH,
+                        minWidth = UnityConstants.ChangesetsColumns.REPOSITORY_MIN_WIDTH,
+                        headerContent = new GUIContent(
+                            GetColumnName(ChangesetsListColumn.Repository))
+                    },
+                    new Column()
+                    {
+                        width = UnityConstants.ChangesetsColumns.GUID_WIDTH,
+                        minWidth = UnityConstants.ChangesetsColumns.GUID_MIN_WIDTH,
+                        headerContent = new GUIContent(
+                            GetColumnName(ChangesetsListColumn.Guid))
+                    }
+                };
+        }
+
+        ChangesetsListHeaderState(Column[] columns)
+            : base(columns)
+        {
+            if (mHeaderTitles == null)
+                mHeaderTitles = TreeHeaderColumns.GetTitles(columns);
+
+            if (mColumsAllowedToggleVisibility == null)
+                mColumsAllowedToggleVisibility = TreeHeaderColumns.GetVisibilities(columns);
+        }
+
+        [SerializeField]
+        string[] mHeaderTitles;
+
+        [SerializeField]
+        bool[] mColumsAllowedToggleVisibility;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsListHeaderState.cs.meta b/Editor/PlasticSCM/Views/Changesets/ChangesetsListHeaderState.cs.meta
new file mode 100644
index 0000000..3c1baf4
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsListHeaderState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7ff9581aa143f4d41b4e351881b8f459
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsListView.cs b/Editor/PlasticSCM/Views/Changesets/ChangesetsListView.cs
new file mode 100644
index 0000000..1ed277c
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsListView.cs
@@ -0,0 +1,418 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEngine;
+using UnityEditor.IMGUI.Controls;
+
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.QueryViews;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Avatar;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.Changesets
+{
+    internal class ChangesetsListView : TreeView
+    {
+        internal ChangesetsListView(
+            ChangesetsListHeaderState headerState,
+            List<string> columnNames,
+            ChangesetsViewMenu menu,
+            Action sizeChangedAction,
+            Action selectionChangedAction,
+            Action doubleClickAction)
+            : base(new TreeViewState())
+        {
+            mColumnNames = columnNames;
+            mMenu = menu;
+            mSizeChangedAction = sizeChangedAction;
+            mSelectionChangedAction = selectionChangedAction;
+            mDoubleClickAction = doubleClickAction;
+
+            multiColumnHeader = new MultiColumnHeader(headerState);
+            multiColumnHeader.canSort = true;
+            multiColumnHeader.sortingChanged += SortingChanged;
+
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+
+            mCooldownFilterAction = new CooldownWindowDelayer(
+                DelayedSearchChanged, UnityConstants.SEARCH_DELAYED_INPUT_ACTION_INTERVAL);
+
+            mCooldownSelectionAction = new CooldownWindowDelayer(
+                DelayedSelectionChanged, UnityConstants.SELECTION_DELAYED_INPUT_ACTION_INTERVAL);
+        }
+
+        protected override void SelectionChanged(IList<int> selectedIds)
+        {
+            mCooldownSelectionAction.Ping();
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(
+            TreeViewItem rootItem)
+        {
+            if (mQueryResult == null)
+            {
+                ClearRows(rootItem, mRows);
+
+                return mRows;
+            }
+
+            RegenerateRows(
+                mListViewItemIds,
+                mQueryResult.GetObjects(),
+                rootItem, mRows);
+
+            return mRows;
+        }
+
+        protected override void SearchChanged(string newSearch)
+        {
+            mCooldownFilterAction.Ping();
+        }
+
+        protected override void ContextClickedItem(int id)
+        {
+            mMenu.Popup();
+            Repaint();
+        }
+
+        public override void OnGUI(Rect rect)
+        {
+            if (Event.current.type == EventType.Layout)
+            {
+                if (IsSizeChanged(treeViewRect, mLastRect))
+                    mSizeChangedAction();
+            }
+
+            mLastRect = treeViewRect;
+
+            base.OnGUI(rect);
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            DrawTreeViewItem.InitializeStyles();
+
+            if (args.item is ChangesetListViewItem)
+            {
+                ChangesetListViewItem changesetListViewItem = (ChangesetListViewItem)args.item;
+                ChangesetInfo changesetInfo = (ChangesetInfo)changesetListViewItem.ObjectInfo;
+
+                ChangesetsListViewItemGUI(
+                    mQueryResult,
+                    rowHeight,
+                    changesetListViewItem,
+                    args,
+                    changesetInfo.ChangesetId == mLoadedChangesetId,
+                    Repaint);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        protected override void DoubleClickedItem(int id)
+        {
+            if (!HasSelection())
+                return;
+
+            mDoubleClickAction();
+        }
+
+        internal void BuildModel(
+            ViewQueryResult queryResult,
+            long loadedChangesetId)
+        {
+            mListViewItemIds.Clear();
+
+            mQueryResult = queryResult;
+            mLoadedChangesetId = loadedChangesetId;
+        }
+
+        internal void Refilter()
+        {
+            if (mQueryResult == null)
+                return;
+
+            Filter filter = new Filter(searchString);
+            mQueryResult.ApplyFilter(filter, mColumnNames);
+        }
+
+        internal void Sort()
+        {
+            if (mQueryResult == null)
+                return;
+
+            int sortedColumnIdx = multiColumnHeader.state.sortedColumnIndex;
+            bool sortAscending = multiColumnHeader.IsSortedAscending(sortedColumnIdx);
+
+            mQueryResult.Sort(
+                mColumnNames[sortedColumnIdx],
+                sortAscending);
+        }
+
+        internal List<RepositorySpec> GetSelectedRepositories()
+        {
+            List<RepositorySpec> result = new List<RepositorySpec>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<object, int> item
+                in mListViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                RepositorySpec repSpec =
+                    mQueryResult.GetRepositorySpec(item.Key);
+                result.Add(repSpec);
+            }
+
+            return result;
+        }
+
+        internal List<RepObjectInfo> GetSelectedRepObjectInfos()
+        {
+            List<RepObjectInfo> result = new List<RepObjectInfo>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<object, int> item
+                in mListViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                RepObjectInfo repObjectInfo =
+                    mQueryResult.GetRepObjectInfo(item.Key);
+                result.Add(repObjectInfo);
+            }
+
+            return result;
+        }
+
+        internal void SelectRepObjectInfos(
+            List<RepObjectInfo> repObjectsToSelect)
+        {
+            List<int> idsToSelect = new List<int>();
+
+            foreach (RepObjectInfo repObjectInfo in repObjectsToSelect)
+            {
+                int repObjectInfoId = GetTreeIdForItem(repObjectInfo);
+
+                if (repObjectInfoId == -1)
+                    continue;
+
+                idsToSelect.Add(repObjectInfoId);
+            }
+
+            TableViewOperations.SetSelectionAndScroll(this, idsToSelect);
+        }
+
+        int GetTreeIdForItem(RepObjectInfo repObjectInfo)
+        {
+            foreach (KeyValuePair<object, int> item in mListViewItemIds.GetInfoItems())
+            {
+                RepObjectInfo currentRepObjectInfo =
+                    mQueryResult.GetRepObjectInfo(item.Key);
+
+                if (!currentRepObjectInfo.Equals(repObjectInfo))
+                    continue;
+
+                if (!currentRepObjectInfo.GUID.Equals(repObjectInfo.GUID))
+                    continue;
+
+                return item.Value;
+            }
+
+            return -1;
+        }
+
+        void DelayedSearchChanged()
+        {
+            Refilter();
+
+            Sort();
+
+            Reload();
+
+            TableViewOperations.ScrollToSelection(this);
+        }
+
+        void DelayedSelectionChanged()
+        {
+            if (!HasSelection())
+                return;
+
+            mSelectionChangedAction();
+        }
+
+        void SortingChanged(MultiColumnHeader multiColumnHeader)
+        {
+            Sort();
+
+            Reload();
+        }
+
+        static void RegenerateRows(
+            ListViewItemIds<object> listViewItemIds,
+            List<object> objectInfos,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            ClearRows(rootItem, rows);
+
+            if (objectInfos.Count == 0)
+                return;
+
+            foreach (object objectInfo in objectInfos)
+            {
+                int objectId;
+                if (!listViewItemIds.TryGetInfoItemId(objectInfo, out objectId))
+                    objectId = listViewItemIds.AddInfoItem(objectInfo);
+
+                ChangesetListViewItem changesetListViewItem =
+                    new ChangesetListViewItem(objectId, objectInfo);
+
+                rootItem.AddChild(changesetListViewItem);
+                rows.Add(changesetListViewItem);
+            }
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static void ChangesetsListViewItemGUI(
+            ViewQueryResult queryResult,
+            float rowHeight,
+            ChangesetListViewItem item,
+            RowGUIArgs args,
+            bool isBoldText,
+            Action avatarLoadedAction)
+        {
+            for (int visibleColumnIdx = 0; visibleColumnIdx < args.GetNumVisibleColumns(); visibleColumnIdx++)
+            {
+                Rect cellRect = args.GetCellRect(visibleColumnIdx);
+
+                if (visibleColumnIdx == 0)
+                {
+                    cellRect.x += UnityConstants.FIRST_COLUMN_WITHOUT_ICON_INDENT;
+                    cellRect.width -= UnityConstants.FIRST_COLUMN_WITHOUT_ICON_INDENT;
+                }
+
+                ChangesetsListColumn column =
+                    (ChangesetsListColumn)args.GetColumn(visibleColumnIdx);
+
+                ChangesetsListViewItemCellGUI(
+                    cellRect,
+                    rowHeight,
+                    queryResult,
+                    item,
+                    column,
+                    avatarLoadedAction,
+                    args.selected,
+                    args.focused,
+                    isBoldText);
+            }
+        }
+
+        static void ChangesetsListViewItemCellGUI(
+            Rect rect,
+            float rowHeight,
+            ViewQueryResult queryResult,
+            ChangesetListViewItem item,
+            ChangesetsListColumn column,
+            Action avatarLoadedAction,
+            bool isSelected,
+            bool isFocused,
+            bool isBoldText)
+        {
+            string columnText = RepObjectInfoView.GetColumnText(
+                queryResult.GetRepositorySpec(item.ObjectInfo),
+                queryResult.GetRepObjectInfo(item.ObjectInfo),
+                ChangesetsListHeaderState.GetColumnName(column));
+
+            if (column == ChangesetsListColumn.CreatedBy)
+            {
+                DrawTreeViewItem.ForItemCell(
+                    rect,
+                    rowHeight,
+                    -1,
+                    GetAvatar.ForEmail(columnText, avatarLoadedAction),
+                    null,
+                    columnText,
+                    isSelected,
+                    isFocused,
+                    isBoldText,
+                    false);
+                return;
+            }
+
+
+            if (column == ChangesetsListColumn.Branch ||
+                column == ChangesetsListColumn.Repository ||
+                column == ChangesetsListColumn.Guid)
+            {
+                DrawTreeViewItem.ForSecondaryLabel(
+                    rect, columnText, isSelected, isFocused, isBoldText);
+                return;
+            }
+
+            DrawTreeViewItem.ForLabel(
+                rect, columnText, isSelected, isFocused, isBoldText);
+        }
+
+        static bool IsSizeChanged(
+            Rect currentRect, Rect lastRect)
+        {
+            if (currentRect.width != lastRect.width)
+                return true;
+
+            if (currentRect.height != lastRect.height)
+                return true;
+
+            return false;
+        }
+
+        Rect mLastRect;
+
+        ListViewItemIds<object> mListViewItemIds = new ListViewItemIds<object>();
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        ViewQueryResult mQueryResult;
+        long mLoadedChangesetId;
+
+        readonly CooldownWindowDelayer mCooldownFilterAction;
+        readonly CooldownWindowDelayer mCooldownSelectionAction;
+        readonly Action mDoubleClickAction;
+        readonly Action mSelectionChangedAction;
+        readonly Action mSizeChangedAction;
+        readonly ChangesetsViewMenu mMenu;
+        readonly List<string> mColumnNames;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsListView.cs.meta b/Editor/PlasticSCM/Views/Changesets/ChangesetsListView.cs.meta
new file mode 100644
index 0000000..cbf1159
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsListView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 59e682a8b37338a46910fa9a939425e3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsSelection.cs b/Editor/PlasticSCM/Views/Changesets/ChangesetsSelection.cs
new file mode 100644
index 0000000..841b9cf
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsSelection.cs
@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+
+using Codice.CM.Common;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.Changesets
+{
+    internal static class ChangesetsSelection
+    {
+        internal static void SelectChangesets(
+            ChangesetsListView listView,
+            List<RepObjectInfo> csetsToSelect,
+            int defaultRow)
+        {
+            if (csetsToSelect == null || csetsToSelect.Count == 0)
+            {
+                TableViewOperations.SelectFirstRow(listView);
+                return;
+            }
+
+            listView.SelectRepObjectInfos(csetsToSelect);
+
+            if (listView.HasSelection())
+                return;
+
+            TableViewOperations.SelectDefaultRow(listView, defaultRow);
+
+            if (listView.HasSelection())
+                return;
+
+            TableViewOperations.SelectFirstRow(listView);
+        }
+
+        internal static List<RepObjectInfo> GetSelectedRepObjectInfos(
+            ChangesetsListView listView)
+        {
+            return listView.GetSelectedRepObjectInfos();
+        }
+
+        internal static int GetSelectedChangesetsCount(
+            ChangesetsListView listView)
+        {
+            return listView.GetSelection().Count;
+        }
+
+        internal static ChangesetExtendedInfo GetSelectedChangeset(
+            ChangesetsListView listView)
+        {
+            List<RepObjectInfo> selectedRepObjectsInfos = listView.GetSelectedRepObjectInfos();
+
+            if (selectedRepObjectsInfos.Count == 0)
+                return null;
+
+            return (ChangesetExtendedInfo)selectedRepObjectsInfos[0];
+        }
+
+        internal static RepositorySpec GetSelectedRepository(
+            ChangesetsListView listView)
+        {
+            List<RepositorySpec> selectedRepositories = listView.GetSelectedRepositories();
+
+            if (selectedRepositories.Count == 0)
+                return null;
+
+            return selectedRepositories[0];
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsSelection.cs.meta b/Editor/PlasticSCM/Views/Changesets/ChangesetsSelection.cs.meta
new file mode 100644
index 0000000..59c29d5
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsSelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 20341761c2011b441b2a3af227beeb71
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsTab.cs b/Editor/PlasticSCM/Views/Changesets/ChangesetsTab.cs
new file mode 100644
index 0000000..f08f4cb
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsTab.cs
@@ -0,0 +1,532 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.Client.Commands;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.QueryViews;
+using PlasticGui.WorkspaceWindow.QueryViews.Changesets;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.UI.Tree;
+using Unity.PlasticSCM.Editor.Views.Diff;
+
+namespace Unity.PlasticSCM.Editor.Views.Changesets
+{
+    internal class ChangesetsTab :
+        IRefreshableView,
+        IChangesetMenuOperations,
+        ChangesetsViewMenu.IMenuOperations
+    {
+        internal ChangesetsTab(
+            WorkspaceInfo wkInfo,
+            IWorkspaceWindow workspaceWindow,
+            IViewSwitcher viewSwitcher,
+            IHistoryViewLauncher historyViewLauncher,
+            EditorWindow parentWindow,
+            bool isGluonMode)
+        {
+            mWkInfo = wkInfo;
+            mParentWindow = parentWindow;
+            mIsGluonMode = isGluonMode;
+
+            BuildComponents(
+                wkInfo, workspaceWindow, viewSwitcher,
+                historyViewLauncher, parentWindow);
+
+            mProgressControls = new ProgressControlsForViews();
+
+            mSplitterState = PlasticSplitterGUILayout.InitSplitterState(
+                new float[] { 0.50f, 0.50f },
+                new int[] { 100, 100 },
+                new int[] { 100000, 100000 }
+            );
+
+            ((IRefreshableView)this).Refresh();
+        }
+
+        internal void OnDisable()
+        {
+            mDiffPanel.OnDisable();
+
+            mSearchField.downOrUpArrowKeyPressed -=
+                SearchField_OnDownOrUpArrowKeyPressed;
+
+            TreeHeaderSettings.Save(
+                mChangesetsListView.multiColumnHeader.state,
+                UnityConstants.CHANGESETS_TABLE_SETTINGS_NAME);
+
+            BoolSetting.Save(
+                mIsChangesPanelVisible,
+                UnityConstants.CHANGESETS_SHOW_CHANGES_SETTING_NAME);
+        }
+
+        internal void Update()
+        {
+            mDiffPanel.Update();
+
+            mProgressControls.UpdateProgress(mParentWindow);
+        }
+
+        internal void OnGUI()
+        {
+            InitializeShowChangesButtonWidth();
+
+            bool wasChangesPanelVisible = mIsChangesPanelVisible;
+
+            DoActionsToolbar(
+                this,
+                mProgressControls,
+                mSearchField,
+                mChangesetsListView,
+                mDateFilter,
+                mChangesetsLabelText,
+                mShowChangesButtonWidth,
+                wasChangesPanelVisible);
+
+            if (mIsChangesPanelVisible)
+            {
+                PlasticSplitterGUILayout.BeginVerticalSplit(mSplitterState);
+            }
+
+            DoChangesetsArea(
+                mChangesetsListView,
+                mProgressControls.IsOperationRunning());
+
+            if (mIsChangesPanelVisible)
+            {
+                if (!wasChangesPanelVisible)
+                    mShouldScrollToSelection = true;
+
+                DoChangesArea(mDiffPanel);
+                PlasticSplitterGUILayout.EndVerticalSplit();
+            }
+        }
+
+        void IRefreshableView.Refresh()
+        {
+            string query = GetChangesetsQuery(mDateFilter);
+
+            FillChangesets(mWkInfo, query);
+        }
+
+        int IChangesetMenuOperations.GetSelectedChangesetsCount()
+        {
+            return ChangesetsSelection.GetSelectedChangesetsCount(mChangesetsListView);
+        }
+
+        void IChangesetMenuOperations.DiffChangeset()
+        {
+            LaunchDiffOperations.DiffChangeset(
+                ChangesetsSelection.GetSelectedRepository(mChangesetsListView),
+                ChangesetsSelection.GetSelectedChangeset(mChangesetsListView),
+                mIsGluonMode);
+        }
+
+        void IChangesetMenuOperations.DiffSelectedChangesets()
+        {
+            List<RepObjectInfo> selectedChangesets = ChangesetsSelection.
+                GetSelectedRepObjectInfos(mChangesetsListView);
+
+            if (selectedChangesets.Count < 2)
+                return;
+
+            LaunchDiffOperations.DiffSelectedChangesets(
+                ChangesetsSelection.GetSelectedRepository(mChangesetsListView),
+                (ChangesetExtendedInfo)selectedChangesets[0],
+                (ChangesetExtendedInfo)selectedChangesets[1],
+                mIsGluonMode);
+        }
+
+        void IChangesetMenuOperations.DiffWithAnotherChangeset() { }
+        void IChangesetMenuOperations.CreateBranch() { }
+        void IChangesetMenuOperations.LabelChangeset() { }
+        void IChangesetMenuOperations.SwitchToChangeset() { }
+        void IChangesetMenuOperations.MergeChangeset() {}
+        void IChangesetMenuOperations.CherryPickChangeset() { }
+        void IChangesetMenuOperations.SubtractiveChangeset() { }
+        void IChangesetMenuOperations.SubtractiveChangesetInterval() { }
+        void IChangesetMenuOperations.CherryPickChangesetInterval() { }
+        void IChangesetMenuOperations.MergeToChangeset() { }
+        void IChangesetMenuOperations.MoveChangeset() { }
+        void IChangesetMenuOperations.DeleteChangeset() { }
+        void IChangesetMenuOperations.BrowseRepositoryOnChangeset() { }
+        void IChangesetMenuOperations.CreateCodeReview() { }
+
+        void SearchField_OnDownOrUpArrowKeyPressed()
+        {
+            mChangesetsListView.SetFocusAndEnsureSelectedItem();
+        }
+
+        void FillChangesets(WorkspaceInfo wkInfo, string query)
+        {
+            if (mIsRefreshing)
+                return;
+
+            mIsRefreshing = true;
+
+            List<RepObjectInfo> changesetsToSelect =
+                ChangesetsSelection.GetSelectedRepObjectInfos(mChangesetsListView);
+
+            int defaultRow = TableViewOperations.
+                GetFirstSelectedRow(mChangesetsListView);
+
+            ((IProgressControls)mProgressControls).ShowProgress(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.LoadingChangesets));
+
+            long loadedChangesetId = -1;
+            ViewQueryResult queryResult = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter();
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    queryResult = new ViewQueryResult(
+                        Plastic.API.FindQuery(wkInfo, query));
+
+                    loadedChangesetId = GetLoadedChangesetId(
+                        wkInfo, mIsGluonMode);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    try
+                    {
+                        if (waiter.Exception != null)
+                        {
+                            ExceptionsHandler.DisplayException(waiter.Exception);
+                            return;
+                        }
+
+                        int changesetsCount = GetChangesetsCount(queryResult);
+
+                        mChangesetsLabelText = string.Format(
+                            PlasticLocalization.GetString(PlasticLocalization.Name.ChangesetsCount),
+                            changesetsCount);
+
+                        UpdateChangesetsList(
+                            mChangesetsListView,
+                            queryResult,
+                            loadedChangesetId);
+
+                        if (changesetsCount == 0)
+                        {
+                            mDiffPanel.ClearInfo();
+                            return;
+                        }
+
+                        ChangesetsSelection.SelectChangesets(
+                            mChangesetsListView, changesetsToSelect, defaultRow);
+                    }
+                    finally
+                    {
+                        ((IProgressControls)mProgressControls).HideProgress();
+                        mIsRefreshing = false;
+                    }
+                });
+        }
+
+        void ChangesetsViewMenu.IMenuOperations.DiffBranch()
+        {
+            LaunchDiffOperations.DiffBranch(
+                ChangesetsSelection.GetSelectedRepository(mChangesetsListView),
+                ChangesetsSelection.GetSelectedChangeset(mChangesetsListView),
+                mIsGluonMode);
+        }
+
+        ChangesetExtendedInfo ChangesetsViewMenu.IMenuOperations.GetSelectedChangeset()
+        {
+            return ChangesetsSelection.GetSelectedChangeset(
+                mChangesetsListView);
+        }
+
+        void OnChangesetsListViewSizeChanged()
+        {
+            if (!mShouldScrollToSelection)
+                return;
+
+            mShouldScrollToSelection = false;
+            TableViewOperations.ScrollToSelection(mChangesetsListView);
+        }
+
+        void OnSelectionChanged()
+        {
+            List<RepObjectInfo> selectedChangesets = ChangesetsSelection.
+                GetSelectedRepObjectInfos(mChangesetsListView);
+
+            if (selectedChangesets.Count != 1)
+                return;
+
+            mDiffPanel.UpdateInfo(
+                MountPointWithPath.BuildWorkspaceRootMountPoint(
+                    ChangesetsSelection.GetSelectedRepository(mChangesetsListView)),
+                (ChangesetExtendedInfo)selectedChangesets[0]);
+        }
+
+        static void UpdateChangesetsList(
+            ChangesetsListView changesetsListView,
+            ViewQueryResult queryResult,
+            long loadedChangesetId)
+        {
+            changesetsListView.BuildModel(
+                queryResult,
+                loadedChangesetId);
+
+            changesetsListView.Refilter();
+
+            changesetsListView.Sort();
+
+            changesetsListView.Reload();
+        }
+
+        static long GetLoadedChangesetId(
+            WorkspaceInfo wkInfo,
+            bool isGluonMode)
+        {
+            if (isGluonMode)
+                return -1;
+
+            return Plastic.API.GetLoadedChangeset(wkInfo);
+        }
+
+        static string GetChangesetsQuery(DateFilter dateFilter)
+        {
+            if (dateFilter.FilterType == DateFilter.Type.AllTime)
+                return QueryConstants.ChangesetsBeginningQuery;
+
+            string whereClause = QueryConstants.GetChangesetsDateWhereClause(
+                dateFilter.GetFilterDate(DateTime.UtcNow));
+
+            return string.Format("{0} {1}",
+                QueryConstants.ChangesetsBeginningQuery,
+                whereClause);
+        }
+
+        static int GetChangesetsCount(
+            ViewQueryResult queryResult)
+        {
+            if (queryResult == null)
+                return 0;
+
+           return queryResult.Count();
+        }
+
+        void DoActionsToolbar(
+            IRefreshableView refreshableView,
+            ProgressControlsForViews progressControls,
+            SearchField searchField,
+            ChangesetsListView changesetsListView,
+            DateFilter dateFilter,
+            string changesetsLabelText,
+            float showChangesButtonWidth,
+            bool wasChangesPanelVisible)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            if (!string.IsNullOrEmpty(changesetsLabelText))
+            {
+                GUILayout.Label(
+                    changesetsLabelText,
+                    UnityStyles.ChangesetsTab.HeaderLabel);
+            }
+
+            if (progressControls.IsOperationRunning())
+            {
+                DrawProgressForViews.ForIndeterminateProgress(
+                    progressControls.ProgressData);
+            }
+
+            GUILayout.FlexibleSpace();
+
+            mIsChangesPanelVisible =
+                DoShowChangesButton(
+                    showChangesButtonWidth,
+                    wasChangesPanelVisible);
+
+            GUILayout.Space(2);
+
+            DrawSearchField.For(
+                searchField,
+                changesetsListView,
+                UnityConstants.SEARCH_FIELD_WIDTH);
+
+            DoDateFilter(
+                refreshableView,
+                dateFilter,
+                progressControls.IsOperationRunning());
+
+            DoRefreshButton(
+                refreshableView,
+                progressControls.IsOperationRunning());
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoChangesetsArea(
+            ChangesetsListView changesetsListView,
+            bool isOperationRunning)
+        {
+            EditorGUILayout.BeginVertical();
+
+            GUI.enabled = !isOperationRunning;
+
+            Rect rect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            changesetsListView.OnGUI(rect);
+
+            GUI.enabled = true;
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static void DoChangesArea(DiffPanel diffPanel)
+        {
+            EditorGUILayout.BeginVertical();
+
+            diffPanel.OnGUI();
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static bool DoShowChangesButton(
+            float showChangesButtonWidth,
+            bool wasChecked)
+        {
+            string buttonText = wasChecked ?
+                PlasticLocalization.GetString(PlasticLocalization.Name.HideChanges) :
+                PlasticLocalization.GetString(PlasticLocalization.Name.ShowChanges);
+
+            GUIContent buttonContent = new GUIContent(buttonText);
+
+            GUIStyle buttonStyle = EditorStyles.toolbarButton;
+
+            Rect toggleRect = GUILayoutUtility.GetRect(
+                buttonContent, buttonStyle,
+                GUILayout.Width(showChangesButtonWidth));
+
+            bool isChecked = GUI.Toggle(
+                toggleRect, wasChecked, buttonContent, buttonStyle);
+
+            return isChecked;
+        }
+
+        static void DoDateFilter(
+            IRefreshableView refreshableView,
+            DateFilter dateFilter,
+            bool isOperationRunning)
+        {
+            GUI.enabled = !isOperationRunning;
+
+            EditorGUI.BeginChangeCheck();
+
+            dateFilter.FilterType = (DateFilter.Type)
+                EditorGUILayout.EnumPopup(
+                    dateFilter.FilterType,
+                    EditorStyles.toolbarDropDown,
+                    GUILayout.Width(100));
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                EnumPopupSetting<DateFilter.Type>.Save(
+                    dateFilter.FilterType,
+                    UnityConstants.CHANGESETS_DATE_FILTER_SETTING_NAME);
+
+                refreshableView.Refresh();
+            }
+
+            GUI.enabled = true;
+        }
+
+        static void DoRefreshButton(
+            IRefreshableView refreshableView,
+            bool isOperationRunning)
+        {
+            EditorGUI.BeginDisabledGroup(isOperationRunning);
+
+            if (GUILayout.Button(new GUIContent(
+                    Images.GetRefreshIcon()), EditorStyles.toolbarButton))
+                refreshableView.Refresh();
+
+            EditorGUI.EndDisabledGroup();
+        }
+
+        void InitializeShowChangesButtonWidth()
+        {
+            if (mShowChangesButtonWidth != -1)
+                return;
+
+            mShowChangesButtonWidth = MeasureMaxWidth.ForTexts(
+                EditorStyles.toolbarButton,
+                PlasticLocalization.GetString(PlasticLocalization.Name.HideChanges),
+                PlasticLocalization.GetString(PlasticLocalization.Name.ShowChanges));
+        }
+
+        void BuildComponents(
+            WorkspaceInfo wkInfo,
+            IWorkspaceWindow workspaceWindow,
+            IViewSwitcher viewSwitcher,
+            IHistoryViewLauncher historyViewLauncher,
+            EditorWindow parentWindow)
+        {
+            mSearchField = new SearchField();
+            mSearchField.downOrUpArrowKeyPressed += SearchField_OnDownOrUpArrowKeyPressed;
+
+            DateFilter.Type dateFilterType =
+                EnumPopupSetting<DateFilter.Type>.Load(
+                    UnityConstants.CHANGESETS_DATE_FILTER_SETTING_NAME,
+                    DateFilter.Type.LastMonth);
+            mDateFilter = new DateFilter(dateFilterType);
+
+            ChangesetsListHeaderState headerState =
+                ChangesetsListHeaderState.GetDefault();
+            TreeHeaderSettings.Load(headerState,
+                UnityConstants.CHANGESETS_TABLE_SETTINGS_NAME,
+                (int)ChangesetsListColumn.CreationDate, false);
+
+            mChangesetsListView = new ChangesetsListView(
+                headerState,
+                ChangesetsListHeaderState.GetColumnNames(),
+                new ChangesetsViewMenu(this, this),
+                sizeChangedAction: OnChangesetsListViewSizeChanged,
+                selectionChangedAction: OnSelectionChanged,
+                doubleClickAction: ((IChangesetMenuOperations)this).DiffChangeset);
+            mChangesetsListView.Reload();
+
+            mIsChangesPanelVisible = BoolSetting.Load(
+                UnityConstants.CHANGESETS_SHOW_CHANGES_SETTING_NAME,
+                true);
+
+            mDiffPanel = new DiffPanel(
+                wkInfo, workspaceWindow, viewSwitcher,
+                historyViewLauncher, parentWindow);
+        }
+
+        bool mIsRefreshing;
+
+        bool mShouldScrollToSelection;
+
+        bool mIsChangesPanelVisible;
+
+        float mShowChangesButtonWidth = -1;
+
+        string mChangesetsLabelText;
+        object mSplitterState;
+
+        DateFilter mDateFilter;
+
+        SearchField mSearchField;
+        ChangesetsListView mChangesetsListView;
+        DiffPanel mDiffPanel;
+
+        readonly bool mIsGluonMode;
+
+        readonly ProgressControlsForViews mProgressControls;
+        readonly EditorWindow mParentWindow;
+        readonly WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsTab.cs.meta b/Editor/PlasticSCM/Views/Changesets/ChangesetsTab.cs.meta
new file mode 100644
index 0000000..6f68dac
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsTab.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 471badd5c87fb154885f11cdf1b49a00
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsViewMenu.cs b/Editor/PlasticSCM/Views/Changesets/ChangesetsViewMenu.cs
new file mode 100644
index 0000000..c92f2d1
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsViewMenu.cs
@@ -0,0 +1,199 @@
+using UnityEditor;
+using UnityEngine;
+
+using Codice.CM.Common;
+using PlasticGui.WorkspaceWindow.QueryViews.Changesets;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.Views.Changesets
+{
+    internal class ChangesetsViewMenu
+    {
+        internal interface IMenuOperations
+        {
+            void DiffBranch();
+            ChangesetExtendedInfo GetSelectedChangeset();
+        }
+
+        internal ChangesetsViewMenu(
+            IChangesetMenuOperations changesetMenuOperations,
+            IMenuOperations menuOperations)
+        {
+            mChangesetMenuOperations = changesetMenuOperations;
+            mMenuOperations = menuOperations;
+
+            BuildComponents();
+        }
+
+
+        internal void Popup()
+        {
+            GenericMenu menu = new GenericMenu();
+
+            UpdateMenuItems(menu);
+
+            menu.ShowAsContext();
+        }
+
+        void DiffChangesetMenuItem_Click()
+        {
+            mChangesetMenuOperations.DiffChangeset();
+        }
+
+        void DiffSelectedChangesetsMenuItem_Click()
+        {
+            mChangesetMenuOperations.DiffSelectedChangesets();
+        }
+        void DiffBranchMenuItem_Click()
+        {
+            mMenuOperations.DiffBranch();
+        }
+
+        void UpdateMenuItems(GenericMenu menu)
+        {
+            ChangesetExtendedInfo singleSeletedChangeset = mMenuOperations.GetSelectedChangeset();
+
+            ChangesetMenuOperations operations = ChangesetMenuUpdater.GetAvailableMenuOperations(
+                mChangesetMenuOperations.GetSelectedChangesetsCount());
+
+            AddDiffChangesetMenuItem(
+                mDiffChangesetMenuItemContent,
+                menu,
+                singleSeletedChangeset,
+                operations,
+                DiffChangesetMenuItem_Click);
+
+            AddDiffSelectedChangesetsMenuItem(
+                mDiffSelectedChangesetsMenuItemContent,
+                menu,
+                operations,
+                DiffSelectedChangesetsMenuItem_Click);
+
+            if (IsOnMainBranch(singleSeletedChangeset))
+                return;
+
+            menu.AddSeparator(string.Empty);
+
+            AddDiffBranchMenuItem(
+               mDiffBranchMenuItemContent,
+               menu,
+               singleSeletedChangeset,
+               operations,
+               DiffBranchMenuItem_Click);
+        }
+
+        static void AddDiffChangesetMenuItem(
+            GUIContent menuItemContent,
+            GenericMenu menu,
+            ChangesetExtendedInfo changeset,
+            ChangesetMenuOperations operations,
+            GenericMenu.MenuFunction menuFunction)
+        {
+            string changesetName =
+                changeset != null ?
+                changeset.ChangesetId.ToString() :
+                string.Empty;
+
+            menuItemContent.text = 
+                PlasticLocalization.GetString(PlasticLocalization.Name.AnnotateDiffChangesetMenuItem,
+                changesetName);
+
+            if (operations.HasFlag(ChangesetMenuOperations.DiffChangeset))
+            {
+                menu.AddItem(
+                    menuItemContent,
+                    false,
+                    menuFunction);
+                return;
+            }
+
+            menu.AddDisabledItem(
+                menuItemContent);
+        }
+
+        static void AddDiffSelectedChangesetsMenuItem(
+            GUIContent menuItemContent,
+            GenericMenu menu,
+            ChangesetMenuOperations operations,
+            GenericMenu.MenuFunction menuFunction)
+        {
+            if (operations.HasFlag(ChangesetMenuOperations.DiffSelectedChangesets))
+            {
+                menu.AddItem(
+                    menuItemContent,
+                    false,
+                    menuFunction);
+
+                return;
+            }
+
+            menu.AddDisabledItem(menuItemContent);
+        }
+
+        static void AddDiffBranchMenuItem(
+            GUIContent menuItemContent,
+            GenericMenu menu,
+            ChangesetExtendedInfo changeset,
+            ChangesetMenuOperations operations,
+            GenericMenu.MenuFunction menuFunction)
+        {
+            string branchName = GetBranchName(changeset);
+
+            menuItemContent.text = 
+                PlasticLocalization.GetString(PlasticLocalization.Name.AnnotateDiffBranchMenuItem,
+                branchName);
+
+            if (operations.HasFlag(ChangesetMenuOperations.DiffChangeset))
+            {
+                menu.AddItem(
+                    menuItemContent,
+                    false,
+                    menuFunction);
+                return;
+            }
+
+            menu.AddDisabledItem(
+                menuItemContent);
+        }
+
+        void BuildComponents()
+        {
+            mDiffChangesetMenuItemContent = new GUIContent();
+            mDiffSelectedChangesetsMenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.ChangesetMenuItemDiffSelected));
+            mDiffBranchMenuItemContent = new GUIContent();
+        }
+
+        static string GetBranchName(ChangesetExtendedInfo changesetInfo)
+        {
+            if (changesetInfo == null)
+                return string.Empty;
+
+            string branchName = changesetInfo.BranchName;
+
+            int lastIndex = changesetInfo.BranchName.LastIndexOf("/");
+
+            if (lastIndex == -1)
+                return branchName;
+
+            return branchName.Substring(lastIndex + 1);
+        }
+
+        static bool IsOnMainBranch(ChangesetExtendedInfo singleSeletedChangeset)
+        {
+            if (singleSeletedChangeset == null)
+                return false;
+
+            return singleSeletedChangeset.BranchName == MAIN_BRANCH_NAME;
+        }
+
+        GUIContent mDiffChangesetMenuItemContent;
+        GUIContent mDiffSelectedChangesetsMenuItemContent;
+        GUIContent mDiffBranchMenuItemContent;
+
+        readonly IChangesetMenuOperations mChangesetMenuOperations;
+        readonly IMenuOperations mMenuOperations;
+
+        const string MAIN_BRANCH_NAME = "/main";
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Changesets/ChangesetsViewMenu.cs.meta b/Editor/PlasticSCM/Views/Changesets/ChangesetsViewMenu.cs.meta
new file mode 100644
index 0000000..21cdf24
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/ChangesetsViewMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 397f62458d0ad3441aaaa1a738bd4f94
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Changesets/DateFilter.cs b/Editor/PlasticSCM/Views/Changesets/DateFilter.cs
new file mode 100644
index 0000000..c6c9397
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/DateFilter.cs
@@ -0,0 +1,43 @@
+using System;
+
+namespace Unity.PlasticSCM.Editor.Views.Changesets
+{
+    internal class DateFilter
+    {
+        internal enum Type
+        {
+            LastWeek,
+            Last15Days,
+            LastMonth,
+            Last3Months,
+            LastYear,
+            AllTime
+        }
+
+        internal Type FilterType;
+
+        internal DateFilter(Type filterType)
+        {
+            FilterType = filterType;
+        }
+
+        internal DateTime GetFilterDate(DateTime referenceDate)
+        {
+            switch (FilterType)
+            {
+                case DateFilter.Type.LastWeek:
+                    return referenceDate.AddDays(-7);
+                case DateFilter.Type.Last15Days:
+                    return referenceDate.AddDays(-15);
+                case DateFilter.Type.LastMonth:
+                    return referenceDate.AddMonths(-1);
+                case DateFilter.Type.Last3Months:
+                    return referenceDate.AddMonths(-3);
+                case DateFilter.Type.LastYear:
+                    return referenceDate.AddYears(-1);
+            }
+
+            return DateTime.MinValue;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Changesets/DateFilter.cs.meta b/Editor/PlasticSCM/Views/Changesets/DateFilter.cs.meta
new file mode 100644
index 0000000..30bc8c0
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/DateFilter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3a4d62c64067bca4cbbd6f7fcad2e190
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Changesets/LaunchDiffOperations.cs b/Editor/PlasticSCM/Views/Changesets/LaunchDiffOperations.cs
new file mode 100644
index 0000000..c068d7a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/LaunchDiffOperations.cs
@@ -0,0 +1,117 @@
+using Codice.CM.Common;
+using Unity.PlasticSCM.Editor.Tool;
+
+namespace Unity.PlasticSCM.Editor.Views.Changesets
+{
+    static class LaunchDiffOperations
+    {
+        internal static void DiffChangeset(
+            RepositorySpec repSpec,
+            long changesetId,
+            bool isGluonMode)
+        {
+            if (changesetId == -1)
+                return;
+
+            string changesetFullSpec = GetChangesetFullSpec(
+                repSpec, changesetId);
+
+            LaunchTool.OpenChangesetDiffs(
+                changesetFullSpec,
+                isGluonMode);
+        }
+
+        internal static void DiffChangeset(
+            RepositorySpec repSpec,
+            ChangesetInfo changesetInfo,
+            bool isGluonMode)
+        {
+            if (changesetInfo == null)
+                return;
+
+            string changesetFullSpec = GetChangesetFullSpec(
+                repSpec, changesetInfo.ChangesetId);
+
+            LaunchTool.OpenChangesetDiffs(
+                changesetFullSpec,
+                isGluonMode);
+        }
+
+        internal static void DiffSelectedChangesets(
+            RepositorySpec repSpec,
+            ChangesetInfo cset1,
+            ChangesetInfo cset2,
+            bool isGluonMode)
+        {
+            ChangesetInfo srcChangesetInfo;
+            ChangesetInfo dstChangesetInfo;
+
+            GetSrcAndDstCangesets(
+                cset1,
+                cset2,
+                out srcChangesetInfo,
+                out dstChangesetInfo);
+
+            string srcChangesetFullSpec = GetChangesetFullSpec(
+                repSpec, srcChangesetInfo.ChangesetId);
+
+            string dstChangesetFullSpec = GetChangesetFullSpec(
+                repSpec, dstChangesetInfo.ChangesetId);
+
+            LaunchTool.OpenSelectedChangesetsDiffs(
+                srcChangesetFullSpec,
+                dstChangesetFullSpec,
+                isGluonMode);
+        }
+
+        internal static void DiffBranch(
+            RepositorySpec repSpec,
+            ChangesetExtendedInfo changesetExtendedInfo,
+            bool isGluonMode)
+        {
+            if (changesetExtendedInfo == null)
+                return;
+
+            string branchFullSpec = GetBranchFullSpec(
+                repSpec, changesetExtendedInfo);
+
+            LaunchTool.OpenBranchDiffs(
+                branchFullSpec,
+                isGluonMode);
+        }
+
+        static void GetSrcAndDstCangesets(
+            ChangesetInfo cset1,
+            ChangesetInfo cset2,
+            out ChangesetInfo srcChangesetInfo,
+            out ChangesetInfo dstChangesetInfo)
+        {
+            if (cset1.LocalTimeStamp < cset2.LocalTimeStamp)
+            {
+                srcChangesetInfo = cset1;
+                dstChangesetInfo = cset2;
+                return;
+            }
+
+            srcChangesetInfo = cset2;
+            dstChangesetInfo = cset1;
+        }
+
+        static string GetChangesetFullSpec(
+            RepositorySpec repSpec,
+            long changesetId)
+        {
+            return string.Format("cs:{0}@{1}",
+                changesetId, repSpec.ToString());
+        }
+
+        static string GetBranchFullSpec(
+            RepositorySpec repSpec,
+            ChangesetExtendedInfo changesetExtendedInfo)
+        {
+            return string.Format("br:{0}@{1}",
+                changesetExtendedInfo.BranchName,
+                repSpec.ToString());
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Changesets/LaunchDiffOperations.cs.meta b/Editor/PlasticSCM/Views/Changesets/LaunchDiffOperations.cs.meta
new file mode 100644
index 0000000..f0712fe
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Changesets/LaunchDiffOperations.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6483fd05e8bf42a47aee5e11dbf6db8a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace.meta b/Editor/PlasticSCM/Views/CreateWorkspace.meta
new file mode 100644
index 0000000..758483b
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 173564ff53b74604b8e070b51861b3f9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceView.cs b/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceView.cs
new file mode 100644
index 0000000..7b57f88
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceView.cs
@@ -0,0 +1,464 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using Codice.Client.Commands.CheckIn;
+using Codice.Client.Common;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using Codice.Client.GameUI.Checkin;
+using PlasticGui;
+using PlasticGui.Configuration.CloudEdition;
+using PlasticGui.Help.Conditions;
+using PlasticGui.SwitcherWindow.Repositories;
+using PlasticGui.SwitcherWindow.Workspaces;
+using PlasticGui.WebApi;
+using Unity.PlasticSCM.Editor.UI.Progress;
+
+namespace Unity.PlasticSCM.Editor.Views.CreateWorkspace
+{
+    internal class CreateWorkspaceView :
+        IPlasticDialogCloser,
+        IWorkspacesRefreshableView
+    {
+        internal interface ICreateWorkspaceListener
+        {
+            void OnWorkspaceCreated(WorkspaceInfo wkInfo, bool isGluonMode);
+        }
+
+        internal CreateWorkspaceView(
+            EditorWindow parentWindow,
+            ICreateWorkspaceListener listener,
+            PlasticAPI plasticApi,
+            IPlasticWebRestApi plasticWebRestApi,
+            string workspacePath)
+        {
+            mParentWindow = parentWindow;
+            mCreateWorkspaceListener = listener;
+            mWorkspacePath = workspacePath;
+            mPlasticWebRestApi = plasticWebRestApi;
+
+            mProgressControls = new ProgressControlsForViews();
+            mWorkspaceOperations = new WorkspaceOperations(this, mProgressControls);
+            mCreateWorkspaceState = CreateWorkspaceViewState.BuildForProjectDefaults();
+
+            Initialize(plasticApi, plasticWebRestApi);
+        }
+
+        internal void Update()
+        {
+            mProgressControls.UpdateProgress(mParentWindow);
+        }
+
+        internal void OnGUI()
+        {
+            if (Event.current.type == EventType.Layout)
+            {
+                mProgressControls.ProgressData.CopyInto(
+                    mCreateWorkspaceState.ProgressData);
+            }
+
+            string repositoryName = mCreateWorkspaceState.RepositoryName;
+
+            DrawCreateWorkspace.ForState(
+                CreateRepository,
+                ValidateAndCreateWorkspace,
+                mParentWindow,
+                mPlasticWebRestApi,
+                mDefaultServer,
+                ref mCreateWorkspaceState);
+
+            if (repositoryName == mCreateWorkspaceState.RepositoryName)
+                return;
+
+            OnRepositoryChanged(
+                mDialogUserAssistant,
+                mCreateWorkspaceState,
+                mWorkspacePath);
+        }
+
+        void Initialize(PlasticAPI plasticApi, IPlasticWebRestApi plasticWebRestApi)
+        {
+            ((IProgressControls)mProgressControls).ShowProgress(string.Empty);
+
+            WorkspaceInfo[] allWorkspaces = null;
+            IList allRepositories = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    mDefaultServer = GetDefaultServer.ToCreateWorkspace(plasticWebRestApi);
+
+                    allWorkspaces = plasticApi.GetAllWorkspacesArray();
+
+                    allRepositories = plasticApi.GetAllRepositories(
+                        mDefaultServer, true);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    ((IProgressControls)mProgressControls).HideProgress();
+
+                    if (waiter.Exception != null)
+                    {
+                        DisplayException(mProgressControls, waiter.Exception);
+                        return;
+                    }
+
+                    string serverSpecPart = string.Format("@{0}",
+                        mDefaultServer);
+
+                    mCreateWorkspaceState.RepositoryName = ValidRepositoryName.Get(
+                        string.Format("{0}{1}",
+                            mCreateWorkspaceState.RepositoryName,
+                            serverSpecPart),
+                        allRepositories);
+
+                    mCreateWorkspaceState.WorkspaceName =
+                        mCreateWorkspaceState.RepositoryName.Replace(
+                            serverSpecPart, string.Empty);
+
+                    mDialogUserAssistant = new CreateWorkspaceDialogUserAssistant(
+                        mWorkspacePath,
+                        allWorkspaces);
+
+                    OnRepositoryChanged(
+                        mDialogUserAssistant,
+                        mCreateWorkspaceState,
+                        mWorkspacePath);
+                });
+        }
+
+        static void OnRepositoryChanged(
+            CreateWorkspaceDialogUserAssistant dialogUserAssistant,
+            CreateWorkspaceViewState createWorkspaceState,
+            string workspacePath)
+        {
+            if (dialogUserAssistant == null)
+                return;
+
+            dialogUserAssistant.RepositoryChanged(
+                createWorkspaceState.RepositoryName,
+                createWorkspaceState.WorkspaceName,
+                workspacePath);
+
+            createWorkspaceState.WorkspaceName =
+                dialogUserAssistant.GetProposedWorkspaceName();
+        }
+
+        void CreateRepository(
+            RepositoryCreationData data)
+        {
+            if (!data.Result)
+                return;
+
+            ((IProgressControls)mProgressControls).ShowProgress(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CreatingRepository,
+                    data.RepName));
+
+            RepositoryInfo createdRepository = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter();
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    createdRepository = Plastic.API.CreateRepository(
+                        data.ServerName, data.RepName);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    ((IProgressControls)mProgressControls).HideProgress();
+
+                    if (waiter.Exception != null)
+                    {
+                        DisplayException(mProgressControls, waiter.Exception);
+                        return;
+                    }
+
+                    if (createdRepository == null)
+                        return;
+
+                    mCreateWorkspaceState.RepositoryName =
+                        createdRepository.GetRepSpec().ToString();
+                });
+        }
+
+        void ValidateAndCreateWorkspace(
+            CreateWorkspaceViewState state)
+        {
+            mWkCreationData = BuildCreationDataFromState(
+                state, mWorkspacePath);
+
+            WorkspaceCreationValidation.AsyncValidation(
+                mWkCreationData, this, mProgressControls);
+            // validation calls IPlasticDialogCloser.CloseDialog()
+            // when the validation is ok
+        }
+
+        void IPlasticDialogCloser.CloseDialog()
+        {
+            ((IProgressControls)mProgressControls).ShowProgress(string.Empty);
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    RepositorySpec repSpec = new SpecGenerator().GenRepositorySpec(
+                        false, mWkCreationData.Repository);
+
+                    bool repositoryExist = Plastic.API.CheckRepositoryExists(
+                        repSpec.Server, repSpec.Name);
+
+                    if (!repositoryExist)
+                        Plastic.API.CreateRepository(repSpec.Server, repSpec.Name);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    ((IProgressControls)mProgressControls).HideProgress();
+
+                    if (waiter.Exception != null)
+                    {
+                        DisplayException(mProgressControls, waiter.Exception);
+                        return;
+                    }
+
+                    mWkCreationData.Result = true;
+                    mWorkspaceOperations.CreateWorkspace(mWkCreationData);
+
+                    // the operation calls IWorkspacesRefreshableView.RefreshAndSelect
+                    // when the workspace is created
+                });
+        }
+
+        void IWorkspacesRefreshableView.RefreshAndSelect(WorkspaceInfo wkInfo)
+        {
+            PerformInitialCheckin.IfRepositoryIsEmpty(
+                wkInfo, mWkCreationData.Repository,
+                mWkCreationData.IsGluonWorkspace, Plastic.API,
+                mProgressControls, mCreateWorkspaceListener);
+        }
+
+        static WorkspaceCreationData BuildCreationDataFromState(
+            CreateWorkspaceViewState state,
+            string workspacePath)
+        {
+            return new WorkspaceCreationData(
+                state.WorkspaceName,
+                workspacePath,
+                state.RepositoryName,
+                state.WorkspaceMode ==
+                    CreateWorkspaceViewState.WorkspaceModes.Gluon,
+                false);
+        }
+
+        static void DisplayException(
+            IProgressControls progressControls,
+            Exception ex)
+        {
+            ExceptionsHandler.LogException(
+                "CreateWorkspaceView", ex);
+
+            progressControls.ShowError(
+                ExceptionsHandler.GetCorrectExceptionMessage(ex));
+        }
+
+        static class PerformInitialCheckin
+        {
+            internal static void IfRepositoryIsEmpty(
+                WorkspaceInfo wkInfo,
+                string repository,
+                bool isGluonWorkspace,
+                IPlasticAPI plasticApi,
+                IProgressControls progressControls,
+                ICreateWorkspaceListener createWorkspaceListener)
+            {
+                RepositoryInfo repInfo = null;
+                bool isEmptyRepository = false;
+
+                progressControls.ShowProgress(string.Empty);
+
+                IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+                waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    RepositorySpec repSpec = new SpecGenerator().
+                        GenRepositorySpec(false, repository);
+
+                    repInfo = plasticApi.GetRepositoryInfo(repSpec);
+
+                    isEmptyRepository = IsEmptyRepositoryCondition.
+                        Evaluate(wkInfo, repSpec, plasticApi);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    progressControls.HideProgress();
+
+                    if (waiter.Exception != null)
+                    {
+                        DisplayException(progressControls, waiter.Exception);
+                        return;
+                    }
+
+                    if (!SetupCloudProjectId.HasCloudProjectId())
+                        SetupCloudProjectId.ForRepository(repInfo);
+
+                    if (!isEmptyRepository)
+                        return;
+
+                    CheckinPackagesAndProjectSettingsFolders(
+                        wkInfo, isGluonWorkspace, plasticApi,
+                        progressControls, createWorkspaceListener);
+                });
+            }
+
+            static void CheckinPackagesAndProjectSettingsFolders(
+                WorkspaceInfo wkInfo,
+                bool isGluonWorkspace,
+                IPlasticAPI plasticApi,
+                IProgressControls progressControls,
+                ICreateWorkspaceListener createWorkspaceListener)
+            {
+                List<string> paths = new List<string> {
+                    Path.Combine(wkInfo.ClientPath, "Packages"),
+                    Path.Combine(wkInfo.ClientPath, "ProjectSettings")
+                };
+
+                string comment = PlasticLocalization.GetString(
+                    PlasticLocalization.Name.UnityInitialCheckinComment);
+
+                progressControls.ShowProgress(PlasticLocalization.GetString(
+                PlasticLocalization.Name.UnityInitialCheckinProgress));
+
+                IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+                waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    PerformAdd(paths, plasticApi);
+
+                    PerformCheckinForMode(
+                        wkInfo, paths, comment, isGluonWorkspace);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    progressControls.HideProgress();
+
+                    if (waiter.Exception != null &&
+                        !IsMergeNeededException(waiter.Exception))
+                    {
+                        DisplayException(progressControls, waiter.Exception);
+                        return;
+                    }
+
+                    createWorkspaceListener.OnWorkspaceCreated(
+                        wkInfo, isGluonWorkspace);
+                });
+            }
+
+            static void PerformAdd(
+                List<string> paths,
+                IPlasticAPI plasticApi)
+            {
+                AddOptions options = new AddOptions();
+                options.AddPrivateParents = true;
+                options.CheckoutParent = true;
+                options.Recurse = true;
+                options.SearchForPrivatePaths = true;
+                options.SkipIgnored = true;
+
+                IList checkouts;
+                plasticApi.Add(
+                    paths.ToArray(), options,
+                    out checkouts);
+            }
+
+            static void PerformCheckinForMode(
+                WorkspaceInfo wkInfo,
+                List<string> paths,
+                string comment,
+                bool isGluonWorkspace)
+            {
+                if (isGluonWorkspace)
+                {
+                    new BaseCommandsImpl().PartialCheckin(
+                        wkInfo, paths, comment);
+                    return;
+                }
+
+                CheckinParams ciParams = new CheckinParams();
+                ciParams.paths = paths.ToArray();
+                ciParams.comment = comment;
+                ciParams.time = DateTime.MinValue;
+                ciParams.flags =
+                    CheckinFlags.Recurse |
+                    CheckinFlags.ProcessSymlinks;
+
+                new BaseCommandsImpl().CheckIn(ciParams);
+            }
+
+            static bool IsMergeNeededException(Exception exception)
+            {
+                if (exception == null)
+                    return false;
+
+                // Check the check-in exception for gluon
+                if (exception is CheckinConflictsException)
+                    return true;
+
+                // Check the check-in exceptions for plastic
+                return exception is CmClientMergeNeededException
+                    || exception is CmClientUpdateMergeNeededException;
+            }
+        }
+
+        class GetDefaultServer
+        {
+            internal static string ToCreateWorkspace(IPlasticWebRestApi plasticWebRestApi)
+            {
+                string clientConfServer = Plastic.ConfigAPI.GetClientConfServer();
+
+                if (!EditionToken.IsCloudEdition())
+                    return clientConfServer;
+
+                string cloudServer = PlasticGuiConfig.Get().
+                    Configuration.DefaultCloudServer;
+
+                if (!string.IsNullOrEmpty(cloudServer))
+                    return cloudServer;
+
+                CloudEditionCreds.Data config =
+                    CloudEditionCreds.GetFromClientConf();
+
+                cloudServer = GetFirstCloudServer.
+                    GetCloudServer(plasticWebRestApi, config.Email, config.Password);
+
+                if (string.IsNullOrEmpty(cloudServer))
+                    return clientConfServer;
+
+                SaveCloudServer.ToPlasticGuiConfig(cloudServer);
+
+                return cloudServer;
+            }
+        }
+
+        WorkspaceCreationData mWkCreationData;
+        CreateWorkspaceViewState mCreateWorkspaceState;
+
+        CreateWorkspaceDialogUserAssistant mDialogUserAssistant;
+
+        string mDefaultServer;
+
+        readonly WorkspaceOperations mWorkspaceOperations;
+        readonly ProgressControlsForViews mProgressControls;
+        readonly string mWorkspacePath;
+        readonly ICreateWorkspaceListener mCreateWorkspaceListener;
+        readonly EditorWindow mParentWindow;
+        readonly IPlasticWebRestApi mPlasticWebRestApi;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceView.cs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceView.cs.meta
new file mode 100644
index 0000000..4c24444
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5294f667272fcb2438a79369c92cc7e7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceViewState.cs b/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceViewState.cs
new file mode 100644
index 0000000..8adf5b3
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceViewState.cs
@@ -0,0 +1,35 @@
+using System.IO;
+
+using UnityEngine;
+
+using Unity.PlasticSCM.Editor.UI.Progress;
+
+namespace Unity.PlasticSCM.Editor.Views.CreateWorkspace
+{
+    internal class CreateWorkspaceViewState
+    {
+        internal enum WorkspaceModes
+        {
+            Developer,
+            Gluon
+        }
+
+        internal string RepositoryName { get; set; }
+        internal string WorkspaceName { get; set; }
+        internal WorkspaceModes WorkspaceMode { get; set; }
+        internal ProgressControlsForViews.Data ProgressData { get; set; }
+
+        internal static CreateWorkspaceViewState BuildForProjectDefaults()
+        {
+            string projectName = Application.productName;
+
+            return new CreateWorkspaceViewState()
+            {
+                RepositoryName = projectName,
+                WorkspaceName = projectName,
+                WorkspaceMode = WorkspaceModes.Developer,
+                ProgressData = new ProgressControlsForViews.Data()
+            };
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceViewState.cs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceViewState.cs.meta
new file mode 100644
index 0000000..edfb9da
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/CreateWorkspaceViewState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 41633509da720014cbd77f755b378ce7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs.meta
new file mode 100644
index 0000000..b5e9a2d
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cecb087091caedf48adcc1cd3b0ebd6d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/CreateRepositoryDialog.cs b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/CreateRepositoryDialog.cs
new file mode 100644
index 0000000..abf5169
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/CreateRepositoryDialog.cs
@@ -0,0 +1,231 @@
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.Common;
+using PlasticGui;
+using PlasticGui.SwitcherWindow.Repositories;
+using PlasticGui.WebApi;
+using PlasticGui.WorkspaceWindow.Servers;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+
+namespace Unity.PlasticSCM.Editor.Views.CreateWorkspace.Dialogs
+{
+    internal class CreateRepositoryDialog :
+        PlasticDialog,
+        KnownServersListOperations.IKnownServersList
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 600, 275);
+            }
+        }
+
+        internal static RepositoryCreationData CreateRepository(
+            EditorWindow parentWindow,
+            IPlasticWebRestApi plasticWebRestApi,
+            string proposedRepositoryName,
+            string proposedServer,
+            string lastUsedRepServer,
+            string clientConfServer)
+        {
+            string server = CreateRepositoryDialogUserAssistant.GetProposedServer(
+                proposedServer, lastUsedRepServer, clientConfServer);
+
+            CreateRepositoryDialog dialog = Create(
+                plasticWebRestApi,
+                new ProgressControlsForDialogs(),
+                proposedRepositoryName,
+                server);
+
+            ResponseType dialogResult = dialog.RunModal(parentWindow);
+
+            RepositoryCreationData result = dialog.BuildCreationData();
+
+            result.Result = dialogResult == ResponseType.Ok;
+            return result;
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(
+                PlasticLocalization.Name.NewRepositoryTitle));
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.NewRepositoryExplanation));
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.CreateRepositoryDialogDetailedExplanation));
+
+            if (Event.current.type == EventType.Layout)
+            {
+                mProgressControls.ProgressData.CopyInto(mProgressData);
+            }
+
+            GUILayout.Space(5);
+
+            DoEntriesArea();
+
+            GUILayout.Space(10);
+
+            DrawProgressForDialogs.For(
+                mProgressControls.ProgressData);
+
+            DoButtonsArea();
+
+            mProgressControls.ForcedUpdateProgress(this);
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.NewRepositoryTitle);
+        }
+
+        void KnownServersListOperations.IKnownServersList.FillValues(List<string> values)
+        {
+            mKnownServers = values;
+        }
+
+        void DoEntriesArea()
+        {
+            mName = TextEntry(
+                PlasticLocalization.GetString(PlasticLocalization.Name.RepositoryNameShortLabel),
+                mName,
+                REPONAME_CONTROL_NAME,
+                ENTRY_WIDTH,
+                ENTRY_X);
+
+            if (!mFocusIsAreadySet)
+            {
+                mFocusIsAreadySet = true;
+                GUI.FocusControl(REPONAME_CONTROL_NAME);
+            }
+
+            GUILayout.Space(5);
+
+            mServer = ComboBox(
+                PlasticLocalization.GetString(PlasticLocalization.Name.RepositoryExplorerServerLabel),
+                mServer,
+                DROPDOWN_CONTROL_NAME,
+                mKnownServers,
+                new GenericMenu.MenuFunction2(SelectServer),
+                ENTRY_WIDTH,
+                ENTRY_X);
+        }
+
+        void SelectServer(object userData)
+        {
+            mServer = userData.ToString();
+
+            Repaint();
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoOkButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoOkButton();
+            }
+        }
+
+        void DoOkButton()
+        {
+            if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.OkButton)))
+                return;
+
+            OkButtonWithValidationAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        void OkButtonWithValidationAction()
+        {
+            RepositoryCreationValidation.AsyncValidation(
+                BuildCreationData(),
+                this,
+                mProgressControls);
+        }
+
+        RepositoryCreationData BuildCreationData()
+        {
+            return new RepositoryCreationData(mName, mServer);
+        }
+
+        static CreateRepositoryDialog Create(
+            IPlasticWebRestApi plasticWebRestApi,
+            ProgressControlsForDialogs progressControls,
+            string proposedRepositoryName,
+            string proposedServer)
+        {
+            var instance = CreateInstance<CreateRepositoryDialog>();
+            instance.mEnterKeyAction = instance.OkButtonWithValidationAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            instance.mPlasticWebRestApi = plasticWebRestApi;
+            instance.mProgressControls = progressControls;
+            instance.BuildComponents(proposedRepositoryName, proposedServer);
+            return instance;
+        }
+
+        void BuildComponents(string proposedRepositoryName, string proposedServer)
+        {
+            mName = proposedRepositoryName;
+            mServer = proposedServer;
+
+            KnownServersListOperations.GetCombinedServers(
+                true,
+                GetExtraServers(proposedServer),
+                mProgressControls,
+                this,
+                mPlasticWebRestApi,
+                CmConnection.Get().GetProfileManager());
+        }
+
+        static List<string> GetExtraServers(string proposedServer)
+        {
+            List<string> result = new List<string>();
+            if (!string.IsNullOrEmpty(proposedServer))
+                result.Add(proposedServer);
+
+            return result;
+        }
+
+        IPlasticWebRestApi mPlasticWebRestApi;
+        bool mFocusIsAreadySet;
+
+        string mName;
+        string mServer;
+        List<string> mKnownServers = new List<string>();
+        ProgressControlsForDialogs.Data mProgressData = new ProgressControlsForDialogs.Data();
+
+        ProgressControlsForDialogs mProgressControls;
+
+        const float ENTRY_WIDTH = 400;
+        const float ENTRY_X = 175f;
+        const string REPONAME_CONTROL_NAME = "CreateRepositoryDialog.RepositoryName";
+        const string DROPDOWN_CONTROL_NAME = "CreateRepositoryDialog.ServerDropdown";
+    }
+}
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/CreateRepositoryDialog.cs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/CreateRepositoryDialog.cs.meta
new file mode 100644
index 0000000..458cfc4
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/CreateRepositoryDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 61f74d0a8a3f1f542b8afe99e65686df
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListHeaderState.cs b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListHeaderState.cs
new file mode 100644
index 0000000..6f93ba0
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListHeaderState.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.CreateWorkspace.Dialogs
+{
+    internal enum RepositoriesListColumn
+    {
+        Name,
+        Server
+    }
+
+    [Serializable]
+    internal class RepositoriesListHeaderState : MultiColumnHeaderState, ISerializationCallbackReceiver
+    {
+        internal static RepositoriesListHeaderState GetDefault()
+        {
+            return new RepositoriesListHeaderState(BuildColumns());
+        }
+
+        internal static List<string> GetColumnNames()
+        {
+            List<string> result = new List<string>();
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.NameColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.ServerColumn));
+            return result;
+        }
+
+        static string GetColumnName(RepositoriesListColumn column)
+        {
+            switch (column)
+            {
+                case RepositoriesListColumn.Name:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.NameColumn);
+                case RepositoriesListColumn.Server:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.ServerColumn);
+                default:
+                    return null;
+            }
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            if (mHeaderTitles != null)
+                TreeHeaderColumns.SetTitles(columns, mHeaderTitles);
+        }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+        }
+
+        static Column[] BuildColumns()
+        {
+            return new Column[]
+                {
+                    new Column()
+                    {
+                        width = 320,
+                        headerContent = new GUIContent(
+                            GetColumnName(RepositoriesListColumn.Name)),
+                        minWidth = 200,
+                        allowToggleVisibility = false,
+                    },
+                    new Column()
+                    {
+                        width = 200,
+                        headerContent = new GUIContent(
+                            GetColumnName(RepositoriesListColumn.Server)),
+                        minWidth = 200,
+                        allowToggleVisibility = false,
+                    }
+                };
+        }
+
+        RepositoriesListHeaderState(Column[] columns)
+            : base(columns)
+        {
+            if (mHeaderTitles == null)
+                mHeaderTitles = TreeHeaderColumns.GetTitles(columns);
+        }
+
+        [SerializeField]
+        string[] mHeaderTitles;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListHeaderState.cs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListHeaderState.cs.meta
new file mode 100644
index 0000000..71ee06d
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListHeaderState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: da6a50477d2d7ff4f81d1c21c58a5b0e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListView.cs b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListView.cs
new file mode 100644
index 0000000..5da9b35
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListView.cs
@@ -0,0 +1,235 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.SwitcherWindow.Repositories;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.CreateWorkspace.Dialogs
+{
+    internal class RepositoriesListView :
+        TreeView,
+        IPlasticTable<RepositoryInfo>
+    {
+        internal RepositoriesListView(
+            RepositoriesListHeaderState headerState,
+            List<string> columnNames,
+            Action doubleClickAction)
+            : base(new TreeViewState())
+        {
+            mColumnNames = columnNames;
+            mDoubleClickAction = doubleClickAction;
+
+            multiColumnHeader = new MultiColumnHeader(headerState);
+            multiColumnHeader.canSort = true;
+            multiColumnHeader.sortingChanged += SortingChanged;
+
+            mColumnComparers = RepositoriesTableDefinition.BuildColumnComparers();
+
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(
+            TreeViewItem rootItem)
+        {
+            RegenerateRows(
+                this, mRepositories, rootItem, mRows);
+
+            return mRows;
+        }
+
+        protected override void SearchChanged(string newSearch)
+        {
+            Refilter();
+
+            Sort();
+
+            Reload();
+
+            TableViewOperations.ScrollToSelection(this);
+        }
+
+        protected override void DoubleClickedItem(int id)
+        {
+            mDoubleClickAction();
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            if (args.item is RepositoryListViewItem)
+            {
+                RepositoryListViewItemGUI(
+                    (RepositoryListViewItem)args.item,
+                    args,
+                    rowHeight);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        internal string GetSelectedRepository()
+        {
+            IList<TreeViewItem> selectedItems = FindRows(GetSelection());
+
+            if (selectedItems.Count == 0)
+                return null;
+
+            return ((RepositoryListViewItem)selectedItems[0])
+                .Repository.GetRepSpec().ToString();
+        }
+
+        void IPlasticTable<RepositoryInfo>.Fill(
+            List<RepositoryInfo> entries,
+            List<RepositoryInfo> entriesToSelect)
+        {
+            mUnfilteredRepositories = entries;
+
+            Refilter();
+
+            Sort();
+
+            Reload();
+        }
+
+        void Refilter()
+        {
+            mRepositories = RepositoriesTableDefinition.TableFilter.Filter(
+                searchString,
+                mUnfilteredRepositories);
+        }
+
+        void Sort()
+        {
+            int sortedColumnIdx = multiColumnHeader.state.sortedColumnIndex;
+            bool sortAscending = multiColumnHeader.IsSortedAscending(sortedColumnIdx);
+
+            IComparer<RepositoryInfo> comparer = mColumnComparers[
+                mColumnNames[sortedColumnIdx]];
+
+            mRepositories.Sort(new SortOrderComparer<RepositoryInfo>(
+                comparer, sortAscending));
+        }
+
+        void SortingChanged(MultiColumnHeader multiColumnHeader)
+        {
+            Sort();
+
+            Reload();
+        }
+
+        static void RegenerateRows(
+            RepositoriesListView listView,
+            IList repositories,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            ClearRows(rootItem, rows);
+
+            if (repositories.Count == 0)
+                return;
+
+            for (int i = 0; i < repositories.Count; i++)
+            {
+                RepositoryListViewItem repositoryListViewItem =
+                    new RepositoryListViewItem(i + 1, (RepositoryInfo)repositories[i]);
+
+                rootItem.AddChild(repositoryListViewItem);
+                rows.Add(repositoryListViewItem);
+            }
+
+            listView.SetSelection(new List<int> { 1 });
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static void RepositoryListViewItemGUI(
+            RepositoryListViewItem item,
+            RowGUIArgs args,
+            float rowHeight)
+        {
+            for (int visibleColumnIdx = 0; visibleColumnIdx < args.GetNumVisibleColumns(); visibleColumnIdx++)
+            {
+                Rect cellRect = args.GetCellRect(visibleColumnIdx);
+
+                RepositoriesListColumn column =
+                    (RepositoriesListColumn)args.GetColumn(visibleColumnIdx);
+
+                RepositoryListViewItemCellGUI(
+                    cellRect,
+                    item,
+                    column,
+                    rowHeight,
+                    args.selected,
+                    args.focused);
+            }
+        }
+
+        static void RepositoryListViewItemCellGUI(
+            Rect rect,
+            RepositoryListViewItem item,
+            RepositoriesListColumn column,
+            float rowHeight,
+            bool isSelected,
+            bool isFocused)
+        {
+            if (column == RepositoriesListColumn.Name)
+            {
+                DrawTreeViewItem.ForItemCell(
+                    rect,
+                    rowHeight,
+                    0,
+                    Images.GetImage(Images.Name.IconRepository),
+                    null,
+                    item.Repository.Name,
+                    isSelected,
+                    isFocused,
+                    false,
+                    false);
+
+                return;
+            }
+
+            DrawTreeViewItem.ForSecondaryLabel(
+                rect,
+                item.Repository.Server,
+                isSelected,
+                isFocused,
+                false);
+        }
+
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        List<RepositoryInfo> mUnfilteredRepositories = new List<RepositoryInfo>();
+        List<RepositoryInfo> mRepositories = new List<RepositoryInfo>();
+
+        readonly Dictionary<string, IComparer<RepositoryInfo>> mColumnComparers;
+        readonly List<string> mColumnNames;
+        readonly Action mDoubleClickAction;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListView.cs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListView.cs.meta
new file mode 100644
index 0000000..e91c4e1
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoriesListView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c18598e9d808edb4583a6aa724ffc268
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryExplorerDialog.cs b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryExplorerDialog.cs
new file mode 100644
index 0000000..1ca1f49
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryExplorerDialog.cs
@@ -0,0 +1,332 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.Client.Common;
+using PlasticGui;
+using PlasticGui.SwitcherWindow.Repositories;
+using PlasticGui.WebApi;
+using PlasticGui.WorkspaceWindow.Servers;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.CreateWorkspace.Dialogs
+{
+    internal class RepositoryExplorerDialog :
+        PlasticDialog,
+        KnownServersListOperations.IKnownServersList
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 750, 450);
+            }
+        }
+
+        internal static string BrowseRepository(
+            EditorWindow parentWindow,
+            IPlasticWebRestApi plasticWebRestApi,
+            string defaultServer)
+        {
+            RepositoryExplorerDialog dialog = Create(
+                plasticWebRestApi,
+                new ProgressControlsForDialogs(),
+                defaultServer,
+                new UnityPlasticGuiMessage(parentWindow));
+
+            ResponseType dialogResult = dialog.RunModal(parentWindow);
+
+            if (dialogResult != ResponseType.Ok)
+                return null;
+
+            return dialog.mRepositoriesListView.GetSelectedRepository();
+        }
+
+        void OnDisable()
+        {
+            mSearchField.downOrUpArrowKeyPressed -=
+                SearchField_OnDownOrUpArrowKeyPressed;
+        }
+
+        protected override void SaveSettings()
+        {
+            TreeHeaderSettings.Save(
+                mRepositoriesListView.multiColumnHeader.state,
+                UnityConstants.REPOSITORIES_TABLE_SETTINGS_NAME);
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(PlasticLocalization.Name.ChooseRepositoryTitle));
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.SelectRepositoryBelow));
+
+            if (Event.current.type == EventType.Layout)
+            {
+                mProgressControls.ProgressData.CopyInto(
+                    mState.ProgressData);
+            }
+
+            bool isEnabled = !mProgressControls.ProgressData.IsWaitingAsyncResult;
+
+            DoToolbarArea(
+                mSearchField,
+                mRepositoriesListView,
+                isEnabled,
+                Refresh,
+                OnServerSelected,
+                ref mState);
+
+            GUILayout.Space(10);
+
+            DoListArea(
+                mRepositoriesListView,
+                isEnabled);
+
+            DrawProgressForDialogs.For(
+                mProgressControls.ProgressData);
+
+            DoButtonsArea();
+
+            mProgressControls.ForcedUpdateProgress(this);
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(PlasticLocalization.Name.ExploreRepositories);
+        }
+
+        void SearchField_OnDownOrUpArrowKeyPressed()
+        {
+            mRepositoriesListView.SetFocusAndEnsureSelectedItem();
+        }
+
+        void Refresh()
+        {
+            mFillRepositoriesTable.FillTable(
+                mRepositoriesListView,
+                null,
+                mProgressControls,
+                null,
+                new FillRepositoriesTable.SaveLastUsedServer(true),
+                mGuiMessage,
+                null,
+                null,
+                null,
+                mRepositoriesListView.searchString,
+                mState.Server,
+                false,
+                false,
+                true);
+        }
+
+        void KnownServersListOperations.IKnownServersList.FillValues(
+            List<string> values)
+        {
+            mState.AvailableServers = values;
+
+            Refresh();
+        }
+
+        void OnServerSelected(object server)
+        {
+            mState.Server = server.ToString();
+            Repaint();
+            Refresh();
+        }
+
+        static void DoToolbarArea(
+            SearchField searchField,
+            RepositoriesListView listView,
+            bool isEnabled,
+            Action refreshAction,
+            GenericMenu.MenuFunction2 selectServerAction,
+            ref State state)
+        {
+            GUILayout.BeginHorizontal();
+
+            GUILayout.Label(
+                PlasticLocalization.GetString(PlasticLocalization.Name.RepositoryExplorerServerLabel));
+
+            GUI.enabled = isEnabled;
+
+            state.Server = DoDropDownTextField(
+                state.Server,
+                state.AvailableServers,
+                selectServerAction,
+                refreshAction);
+
+            var refreshText = PlasticLocalization.GetString(PlasticLocalization.Name.RefreshButton);
+            if (GUILayout.Button(refreshText, EditorStyles.miniButton))
+                refreshAction();
+
+            GUILayout.FlexibleSpace();
+
+            DrawSearchField.For(
+                searchField, listView, SEARCH_FIELD_WIDTH);
+
+            GUI.enabled = true;
+
+            GUILayout.EndHorizontal();
+        }
+
+        static void DoListArea(
+            RepositoriesListView listView,
+            bool isEnabled)
+        {
+            GUI.enabled = isEnabled;
+
+            Rect treeRect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            listView.OnGUI(treeRect);
+
+            GUI.enabled = true;
+        }
+
+        static string DoDropDownTextField(
+            string text,
+            List<string> options,
+            GenericMenu.MenuFunction2 selectServerAction,
+            Action enterKeyAction)
+        {
+            bool isEnterKeyPressed = false;
+
+            Event e = Event.current;
+
+            if (Keyboard.IsReturnOrEnterKeyPressed(e))
+            {
+                isEnterKeyPressed = true;
+            }
+
+            string result = DropDownTextField.DoDropDownTextField(
+                text,
+                DROPDOWN_CONTROL_NAME,
+                options,
+                selectServerAction,
+
+                GUILayout.Width(DROPDOWN_WIDTH));
+
+            if (isEnterKeyPressed &&
+                GUI.GetNameOfFocusedControl() == DROPDOWN_CONTROL_NAME)
+            {
+                e.Use();
+                enterKeyAction();
+            }
+
+            return result;
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoOkButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoOkButton();
+            }
+        }
+
+        void DoOkButton()
+        {
+            if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.OkButton)))
+                return;
+
+            OkButtonAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        static RepositoryExplorerDialog Create(
+            IPlasticWebRestApi plasticWebRestApi,
+            ProgressControlsForDialogs progressControls,
+            string defaultServer,
+            GuiMessage.IGuiMessage guiMessage)
+        {
+            var instance = CreateInstance<RepositoryExplorerDialog>();
+            instance.mGuiMessage = guiMessage;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            instance.mProgressControls = progressControls;
+            instance.BuildComponents(defaultServer, plasticWebRestApi);
+            return instance;
+        }
+
+        void BuildComponents(
+            string defaultServer,
+            IPlasticWebRestApi plasticWebRestApi)
+        {
+            mSearchField = new SearchField();
+            mSearchField.downOrUpArrowKeyPressed += SearchField_OnDownOrUpArrowKeyPressed;
+
+            RepositoriesListHeaderState headerState =
+                RepositoriesListHeaderState.GetDefault();
+            TreeHeaderSettings.Load(headerState,
+                UnityConstants.REPOSITORIES_TABLE_SETTINGS_NAME,
+                (int)RepositoriesListColumn.Name);
+
+            mRepositoriesListView = new RepositoriesListView(
+                headerState,
+                RepositoriesListHeaderState.GetColumnNames(),
+                OkButtonAction);
+            mRepositoriesListView.Reload();
+
+            mFillRepositoriesTable = new FillRepositoriesTable(
+                new LocalRepositoriesProvider());
+
+            mState = new State()
+            {
+                Server = defaultServer,
+                ProgressData = new ProgressControlsForDialogs.Data()
+            };
+
+            KnownServersListOperations.GetCombinedServers(
+                true,
+                new List<string>(),
+                mProgressControls,
+                this,
+                plasticWebRestApi,
+                CmConnection.Get().GetProfileManager());
+        }
+
+        SearchField mSearchField;
+        RepositoriesListView mRepositoriesListView;
+        ProgressControlsForDialogs mProgressControls;
+        FillRepositoriesTable mFillRepositoriesTable;
+        State mState;
+        GuiMessage.IGuiMessage mGuiMessage;
+
+        const string DROPDOWN_CONTROL_NAME = "RepositoryExplorerDialog.ServerDropdown";
+        const float DROPDOWN_WIDTH = 250;
+        const float SEARCH_FIELD_WIDTH = 450;
+
+        class State
+        {
+            internal List<string> AvailableServers { get; set; }
+            internal string Server { get; set; }
+            internal ProgressControlsForDialogs.Data ProgressData { get; set; }
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryExplorerDialog.cs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryExplorerDialog.cs.meta
new file mode 100644
index 0000000..efe2c23
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryExplorerDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b29af44841cd6644e876233cd057bc18
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryListViewItem.cs b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryListViewItem.cs
new file mode 100644
index 0000000..027e158
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryListViewItem.cs
@@ -0,0 +1,19 @@
+using UnityEditor.IMGUI.Controls;
+
+using Codice.CM.Common;
+
+namespace Unity.PlasticSCM.Editor.Views.CreateWorkspace.Dialogs
+{
+    internal class RepositoryListViewItem : TreeViewItem
+    {
+        internal RepositoryInfo Repository { get; private set; }
+
+        internal RepositoryListViewItem(int id, RepositoryInfo repository)
+            : base(id, 0)
+        {
+            Repository = repository;
+
+            displayName = repository.Name;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryListViewItem.cs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryListViewItem.cs.meta
new file mode 100644
index 0000000..103e997
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/Dialogs/RepositoryListViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 83882c7718d0fc34f8a05141328ceac1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/DrawCreateWorkspaceView.cs b/Editor/PlasticSCM/Views/CreateWorkspace/DrawCreateWorkspaceView.cs
new file mode 100644
index 0000000..1ea51c8
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/DrawCreateWorkspaceView.cs
@@ -0,0 +1,537 @@
+using System;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.Common;
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WebApi;
+using PlasticGui.SwitcherWindow.Repositories;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.Views.CreateWorkspace.Dialogs;
+
+namespace Unity.PlasticSCM.Editor.Views.CreateWorkspace
+{
+    internal static class DrawCreateWorkspace
+    {
+        internal static void ForState(
+            Action<RepositoryCreationData> createRepositoryAction,
+            Action<CreateWorkspaceViewState> createWorkspaceAction,
+            EditorWindow parentWindow,
+            IPlasticWebRestApi plasticWebRestApi,
+            string defaultServer,
+            ref CreateWorkspaceViewState state)
+        {
+            DoTitle();
+
+            GUILayout.Space(15);
+
+            DoFieldsArea(
+                createRepositoryAction,
+                parentWindow,
+                plasticWebRestApi,
+                defaultServer,
+                ref state);
+
+            GUILayout.Space(10);
+
+            DoRadioButtonsArea(ref state);
+
+            GUILayout.Space(3);
+
+            DoHelpLabel();
+
+            GUILayout.Space(10);
+
+            DoCreateWorkspaceButton(
+                createWorkspaceAction,
+                ref state);
+
+            GUILayout.Space(5);
+
+            DoNotificationArea(state.ProgressData);
+        }
+
+        static void DoTitle()
+        {
+            GUILayout.Label(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.NewWorkspace),
+                UnityStyles.Dialog.MessageTitle);
+
+            GUILayout.Label(
+                PlasticLocalization.GetString(PlasticLocalization.Name.WorkspacesExplanationLabel),
+                EditorStyles.wordWrappedLabel);
+        }
+
+        static void DoFieldsArea(
+            Action<RepositoryCreationData> createRepositoryAction,
+            EditorWindow parentWindow,
+            IPlasticWebRestApi plasticWebRestApi,
+            string defaultServer,
+            ref CreateWorkspaceViewState state)
+        {
+            DoRepositoryField(
+                createRepositoryAction,
+                parentWindow,
+                plasticWebRestApi,
+                defaultServer,
+                ref state);
+
+            DoWorkspaceField(ref state);
+        }
+
+        static void DoRepositoryField(
+            Action<RepositoryCreationData> createRepositoryAction,
+            EditorWindow parentWindow,
+            IPlasticWebRestApi plasticWebRestApi,
+            string defaultServer,
+            ref CreateWorkspaceViewState state)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            DoLabel(
+                PlasticLocalization.GetString(PlasticLocalization.Name.RepositoryName));
+
+            state.RepositoryName = DoTextField(
+                state.RepositoryName,
+                !state.ProgressData.IsOperationRunning,
+                LABEL_WIDTH,
+                TEXTBOX_WIDTH - BROWSE_BUTTON_WIDTH);
+
+            float browseButtonX =
+                LABEL_WIDTH + TEXTBOX_WIDTH + BUTTON_MARGIN -
+                BROWSE_BUTTON_WIDTH;
+            float browseButtonWidth =
+                BROWSE_BUTTON_WIDTH - BUTTON_MARGIN;
+
+            if (DoButton(
+                    "...",
+                    !state.ProgressData.IsOperationRunning,
+                    browseButtonX,
+                    browseButtonWidth))
+            {
+                DoBrowseRepositoryButton(
+                    parentWindow,
+                    plasticWebRestApi,
+                    defaultServer,
+                    ref state);
+                EditorGUIUtility.ExitGUI();
+            }
+
+            float newButtonX =
+                LABEL_WIDTH + TEXTBOX_WIDTH + BUTTON_MARGIN;
+            float newButtonWidth =
+                NEW_BUTTON_WIDTH - BUTTON_MARGIN;
+
+            if (DoButton(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.NewButton),
+                    !state.ProgressData.IsOperationRunning,
+                    newButtonX, newButtonWidth))
+            {
+                DoNewRepositoryButton(
+                    createRepositoryAction,
+                    parentWindow,
+                    plasticWebRestApi,
+                    state.RepositoryName,
+                    defaultServer);
+                EditorGUIUtility.ExitGUI();
+            }
+
+            ValidationResult validationResult = ValidateRepositoryName(
+                state.RepositoryName);
+
+            if (!validationResult.IsValid)
+                DoWarningLabel(validationResult.ErrorMessage,
+                    LABEL_WIDTH + TEXTBOX_WIDTH + NEW_BUTTON_WIDTH + LABEL_MARGIN);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoWorkspaceField(
+            ref CreateWorkspaceViewState state)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            DoLabel(
+                PlasticLocalization.GetString(PlasticLocalization.Name.WorkspaceName));
+
+            state.WorkspaceName = DoTextField(
+                state.WorkspaceName,
+                !state.ProgressData.IsOperationRunning,
+                LABEL_WIDTH,
+                TEXTBOX_WIDTH - BROWSE_BUTTON_WIDTH);
+
+            ValidationResult validationResult = ValidateWorkspaceName(
+                state.WorkspaceName);
+
+            if (!validationResult.IsValid)
+                DoWarningLabel(validationResult.ErrorMessage,
+                    LABEL_WIDTH + TEXTBOX_WIDTH - BROWSE_BUTTON_WIDTH + LABEL_MARGIN);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoRadioButtonsArea(
+            ref CreateWorkspaceViewState state)
+        {
+            EditorGUILayout.BeginVertical();
+            DoLabel(
+                PlasticLocalization.GetString(PlasticLocalization.Name.WorkPreferenceQuestion));
+
+            if (DoRadioButton(
+                PlasticLocalization.GetString(PlasticLocalization.Name.WorkPreferenceAnswerPlastic),
+                state.WorkspaceMode == CreateWorkspaceViewState.WorkspaceModes.Developer,
+                !state.ProgressData.IsOperationRunning,
+                RADIO_BUTTON_MARGIN))
+                state.WorkspaceMode = CreateWorkspaceViewState.WorkspaceModes.Developer;
+
+            if (DoRadioButton(
+                PlasticLocalization.GetString(PlasticLocalization.Name.WorkPreferenceAnswerGluon),
+                state.WorkspaceMode == CreateWorkspaceViewState.WorkspaceModes.Gluon,
+                !state.ProgressData.IsOperationRunning,
+                RADIO_BUTTON_MARGIN))
+                state.WorkspaceMode = CreateWorkspaceViewState.WorkspaceModes.Gluon;
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static void DoCreateWorkspaceButton(
+            Action<CreateWorkspaceViewState> createWorkspaceAction,
+            ref CreateWorkspaceViewState state)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            bool isButtonEnabled =
+                IsValidState(state) &&
+                !state.ProgressData.IsOperationRunning;
+
+            string buttonText = PlasticLocalization.GetString(
+                PlasticLocalization.Name.CreateWorkspace);
+
+            bool isButtonClicked = DoButton(buttonText, isButtonEnabled,
+                CREATE_WORKSPACE_BUTTON_MARGIN, CREATE_WORKSPACE_BUTTON_WIDTH);
+
+            GUI.enabled = true;
+
+            if (state.ProgressData.IsOperationRunning)
+            {
+                DoProgress(state.ProgressData,
+                    CREATE_WORKSPACE_BUTTON_MARGIN +
+                    PROGRESS_MARGIN +
+                    CREATE_WORKSPACE_BUTTON_WIDTH);
+            }
+
+            EditorGUILayout.EndHorizontal();
+
+            if (isButtonClicked)
+                createWorkspaceAction(state);
+        }
+
+        static void DoBrowseRepositoryButton(
+            EditorWindow parentWindow,
+            IPlasticWebRestApi plasticWebRestApi,
+            string defaultServer,
+            ref CreateWorkspaceViewState state)
+        {
+            string result = RepositoryExplorerDialog.BrowseRepository(
+                parentWindow,
+                plasticWebRestApi,
+                defaultServer);
+
+            if (string.IsNullOrEmpty(result))
+                return;
+
+            state.RepositoryName = result;
+        }
+
+        static void DoNewRepositoryButton(
+            Action<RepositoryCreationData> createRepositoryAction,
+            EditorWindow parentWindow,
+            IPlasticWebRestApi plasticWebRestApi,
+            string repositoryName,
+            string defaultServer)
+        {
+            string proposedRepositoryName = string.Empty;
+            string proposedServer = string.Empty;
+
+            RepositorySpec repSpec = GetRepSpecFromName(repositoryName);
+
+            if (repSpec != null)
+            {
+                proposedRepositoryName = repSpec.Name;
+                proposedServer = repSpec.Server;
+            }
+
+            RepositoryCreationData creationData = CreateRepositoryDialog.CreateRepository(
+                parentWindow,
+                plasticWebRestApi,
+                proposedRepositoryName,
+                proposedServer,
+                defaultServer,
+                ClientConfig.Get().GetWorkspaceServer());
+
+            createRepositoryAction(creationData);
+        }
+
+        static void DoHelpLabel()
+        {
+            string linkText = PlasticLocalization.GetString(PlasticLocalization.Name.HereLink);
+            string labelText = string.Format(
+                PlasticLocalization.GetString(PlasticLocalization.Name.LearnMoreDifferences),
+                UnityStyles.HexColors.LINK_COLOR,
+                linkText);
+
+            EditorGUILayout.BeginHorizontal();
+
+            if (DoLinkLabel(labelText, linkText, RADIO_BUTTON_MARGIN))
+                Application.OpenURL(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.PlasticSCMFullVsPartialWorkspaceLink));
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoNotificationArea(ProgressControlsForViews.Data progressData)
+        {
+            if (string.IsNullOrEmpty(progressData.NotificationMessage))
+                return;
+
+            DrawProgressForViews.ForNotificationArea(progressData);
+        }
+
+        static void DoLabel(string labelText)
+        {
+            GUIStyle labelStyle = EditorStyles.label;
+
+            Rect rect = GUILayoutUtility.GetRect(
+                new GUIContent(labelText),
+                labelStyle);
+
+            GUI.Label(rect, labelText, labelStyle);
+        }
+
+        static string DoTextField(
+            string entryValue,
+            bool enabled,
+            float textBoxLeft,
+            float textBoxWidth)
+        {
+            GUI.enabled = enabled;
+
+            var rect = GUILayoutUtility.GetRect(
+                new GUIContent(entryValue),
+                UnityStyles.Dialog.EntryLabel);
+            rect.width = textBoxWidth;
+            rect.x = textBoxLeft;
+
+            string result = GUI.TextField(rect, entryValue);
+
+            GUI.enabled = true;
+
+            return result;
+        }
+
+        static bool DoButton(
+            string text,
+            bool isEnabled,
+            float buttonLeft,
+            float buttonWidth)
+        {
+            GUI.enabled = isEnabled;
+
+            var rect = GUILayoutUtility.GetRect(
+                new GUIContent(text),
+                UnityStyles.Dialog.EntryLabel);
+
+            rect.width = buttonWidth;
+            rect.x = buttonLeft;
+
+            bool result = GUI.Button(rect, text);
+            GUI.enabled = true;
+            return result;
+        }
+
+        static bool DoRadioButton(
+            string text,
+            bool isChecked,
+            bool isEnabled,
+            float buttonLeft)
+        {
+            GUI.enabled = isEnabled;
+
+            GUIStyle radioButtonStyle =
+                EditorStyles.radioButton;
+
+            var rect = GUILayoutUtility.GetRect(
+                new GUIContent(text),
+                radioButtonStyle);
+
+            rect.x = buttonLeft;
+
+            bool result = GUI.Toggle(
+                rect,
+                isChecked,
+                text,
+                radioButtonStyle);
+
+            GUI.enabled = true;
+
+            return result;
+        }
+
+        static void DoWarningLabel(
+            string labelText,
+            float labelLeft)
+        {
+            Rect rect = GUILayoutUtility.GetRect(
+                new GUIContent(labelText),
+                EditorStyles.label);
+
+            rect.x = labelLeft;
+
+            GUI.Label(rect,
+                new GUIContent(labelText, Images.GetWarnIcon()),
+                UnityStyles.IncomingChangesTab.HeaderWarningLabel);
+        }
+
+        static bool DoLinkLabel(
+            string labelText,
+            string linkText,
+            float labelLeft)
+        {
+            GUIContent labelContent = new GUIContent(labelText);
+            GUIStyle labelStyle = new GUIStyle(EditorStyles.miniLabel);
+            labelStyle.richText = true;
+
+            Rect rect = GUILayoutUtility.GetRect(
+                labelContent,
+                labelStyle);
+
+            rect.x = labelLeft;
+
+            Rect linkRect = GetLinkRect(
+                labelText,
+                linkText,
+                labelContent,
+                labelStyle,
+                rect);
+
+            EditorGUIUtility.AddCursorRect(linkRect, MouseCursor.Link);
+
+            GUI.Label(rect, labelText, labelStyle);
+
+            return Mouse.IsLeftMouseButtonPressed(Event.current)
+                && linkRect.Contains(Event.current.mousePosition);
+        }
+
+        static void DoProgress(
+            ProgressControlsForViews.Data data,
+            float progressLeft)
+        {
+            if (string.IsNullOrEmpty(data.ProgressMessage))
+                return;
+
+            var rect = GUILayoutUtility.GetRect(
+                new GUIContent(data.ProgressMessage),
+                UnityStyles.Dialog.EntryLabel);
+
+            rect.x = progressLeft;
+
+            GUI.Label(rect, data.ProgressMessage);
+        }
+
+        static Rect GetLinkRect(
+            string labelText,
+            string linkText,
+            GUIContent labelContent,
+            GUIStyle labelStyle,
+            Rect rect)
+        {
+            int beginLinkChar = labelText.IndexOf(linkText);
+            int endLinkChar = beginLinkChar + linkText.Length;
+
+            Vector2 beginPos = labelStyle.GetCursorPixelPosition(
+               rect, labelContent, beginLinkChar);
+            Vector2 endPos = labelStyle.GetCursorPixelPosition(
+               rect, labelContent, endLinkChar);
+
+            Rect linkRect = new Rect(
+                beginPos.x,
+                beginPos.y,
+                endPos.x - beginPos.x,
+                labelStyle.lineHeight * 1.2f);
+
+            return linkRect;
+        }
+
+        static bool IsValidState(
+            CreateWorkspaceViewState state)
+        {
+            if (!ValidateRepositoryName(state.RepositoryName).IsValid)
+                return false;
+
+            if (!ValidateWorkspaceName(state.WorkspaceName).IsValid)
+                return false;
+
+            return true;
+        }
+
+        static ValidationResult ValidateRepositoryName(string repositoryName)
+        {
+            ValidationResult result = new ValidationResult();
+
+            if (string.IsNullOrEmpty(repositoryName))
+            {
+                result.ErrorMessage = PlasticLocalization.GetString(PlasticLocalization.Name.RepositoryNameEmpty);
+                result.IsValid = false;
+                return result;
+            }
+
+            result.IsValid = true;
+            return result;
+        }
+
+        static ValidationResult ValidateWorkspaceName(string workspaceName)
+        {
+            ValidationResult result = new ValidationResult();
+
+            if (string.IsNullOrEmpty(workspaceName))
+            {
+                result.ErrorMessage = PlasticLocalization.GetString(PlasticLocalization.Name.WorkspaceNameEmpty);
+                result.IsValid = false;
+                return result;
+            }
+
+            result.IsValid = true;
+            return result;
+        }
+
+        static RepositorySpec GetRepSpecFromName(string repositoryName)
+        {
+            if (string.IsNullOrEmpty(repositoryName))
+                return null;
+
+            return new SpecGenerator().
+                GenRepositorySpec(false, repositoryName);
+        }
+
+        class ValidationResult
+        {
+            internal string ErrorMessage;
+            internal bool IsValid;
+        }
+
+        const float LABEL_WIDTH = 150;
+        const float TEXTBOX_WIDTH = 400;
+        const float BROWSE_BUTTON_WIDTH = 25;
+        const float NEW_BUTTON_WIDTH = 60;
+        const float BUTTON_MARGIN = 2;
+        const float LABEL_MARGIN = 2;
+        const float RADIO_BUTTON_MARGIN = 38;
+        const float PROGRESS_MARGIN = 5;
+        const float CREATE_WORKSPACE_BUTTON_MARGIN = 32;
+        const float CREATE_WORKSPACE_BUTTON_WIDTH = 160;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/DrawCreateWorkspaceView.cs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/DrawCreateWorkspaceView.cs.meta
new file mode 100644
index 0000000..b6beb45
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/DrawCreateWorkspaceView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 788db2c7ca3c2804d912f447ffc19856
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/ValidRepositoryName.cs b/Editor/PlasticSCM/Views/CreateWorkspace/ValidRepositoryName.cs
new file mode 100644
index 0000000..9d23d42
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/ValidRepositoryName.cs
@@ -0,0 +1,49 @@
+using System.Collections;
+
+using Codice.CM.Common;
+
+namespace Unity.PlasticSCM.Editor.Views.CreateWorkspace
+{
+    internal static class ValidRepositoryName
+    {
+        internal static string Get(string repositoryName, IList repositories)
+        {
+            string validRepositoryName = GetValidRepositoryName(repositoryName);
+            string result = validRepositoryName;
+
+            int i = 2;
+
+            while (RepositoryExists(result, repositories))
+            {
+                result = validRepositoryName + "_" + i.ToString();
+                i++;
+            }
+
+            return result;
+        }
+
+        static bool RepositoryExists(string repositoryName, IList repositories)
+        {
+            if (repositories == null)
+                return false;
+
+            foreach (RepositoryInfo repInfo in repositories)
+            {
+                if (repInfo.Name.Equals(repositoryName))
+                    return true;
+            }
+
+            return false;
+        }
+
+        static string GetValidRepositoryName(string newRepository)
+        {
+            string result = newRepository.Replace(SUBMODULE_SEPARATOR, '-');
+            result = result.Replace(PIPE_CHARACTER, '-');
+            return result;
+        }
+
+        const char SUBMODULE_SEPARATOR = '/';
+        const char PIPE_CHARACTER = '|';
+    }
+}
diff --git a/Editor/PlasticSCM/Views/CreateWorkspace/ValidRepositoryName.cs.meta b/Editor/PlasticSCM/Views/CreateWorkspace/ValidRepositoryName.cs.meta
new file mode 100644
index 0000000..d592e77
--- /dev/null
+++ b/Editor/PlasticSCM/Views/CreateWorkspace/ValidRepositoryName.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 60f5fb7fb3626214f9d97215fe186cbf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff.meta b/Editor/PlasticSCM/Views/Diff.meta
new file mode 100644
index 0000000..b16e6d8
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 37b5532626676e045a3b172c915e5d79
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/ChangeCategoryTreeViewItem.cs b/Editor/PlasticSCM/Views/Diff/ChangeCategoryTreeViewItem.cs
new file mode 100644
index 0000000..7ce18eb
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/ChangeCategoryTreeViewItem.cs
@@ -0,0 +1,18 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui.WorkspaceWindow.Diff;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff
+{
+    internal class ChangeCategoryTreeViewItem : TreeViewItem
+    {
+        internal ChangeCategory Category { get; private set; }
+
+        internal ChangeCategoryTreeViewItem(
+            int id, int depth, ChangeCategory category)
+            : base(id, depth, category.GetHeaderText())
+        {
+            Category = category;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/ChangeCategoryTreeViewItem.cs.meta b/Editor/PlasticSCM/Views/Diff/ChangeCategoryTreeViewItem.cs.meta
new file mode 100644
index 0000000..0bcac47
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/ChangeCategoryTreeViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 156e16594aa6bd54cb77aa3f8eae5c82
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/ClientDiffTreeViewItem.cs b/Editor/PlasticSCM/Views/Diff/ClientDiffTreeViewItem.cs
new file mode 100644
index 0000000..4d189aa
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/ClientDiffTreeViewItem.cs
@@ -0,0 +1,20 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui.WorkspaceWindow.Diff;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff
+{
+    internal class ClientDiffTreeViewItem : TreeViewItem
+    {
+        internal ClientDiffInfo Difference { get; private set; }
+
+        internal ClientDiffTreeViewItem(
+            int id, int depth, ClientDiffInfo diff)
+            : base(id, depth)
+        {
+            Difference = diff;
+
+            displayName = diff.PathString;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/ClientDiffTreeViewItem.cs.meta b/Editor/PlasticSCM/Views/Diff/ClientDiffTreeViewItem.cs.meta
new file mode 100644
index 0000000..91b63af
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/ClientDiffTreeViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3fdd86a000d1ef04094416eefed53087
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/Dialogs.meta b/Editor/PlasticSCM/Views/Diff/Dialogs.meta
new file mode 100644
index 0000000..a909c0a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/Dialogs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ac250bc549a212428286f328779be0e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/Dialogs/GetRestorePathDialog.cs b/Editor/PlasticSCM/Views/Diff/Dialogs/GetRestorePathDialog.cs
new file mode 100644
index 0000000..0e7216a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/Dialogs/GetRestorePathDialog.cs
@@ -0,0 +1,249 @@
+using System.IO;
+
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+using PlasticGui.WorkspaceWindow;
+using PlasticGui.WorkspaceWindow.Diff;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff.Dialogs
+{
+    internal class GetRestorePathDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 600, 205);
+            }
+        }
+
+        internal static GetRestorePathData GetRestorePath(
+            string wkPath,
+            string restorePath,
+            string explanation,
+            bool isDirectory,
+            bool showSkipButton,
+            EditorWindow parentWindow)
+        {
+            GetRestorePathDialog dialog = Create(
+                new ProgressControlsForDialogs(),
+                wkPath,
+                GetProposedRestorePath.For(restorePath),
+                explanation,
+                isDirectory,
+                showSkipButton);
+
+            ResponseType dialogResult = dialog.RunModal(parentWindow);
+
+            GetRestorePathData result = dialog.BuildGetRestorePathResult();
+
+            result.Result = GetRestorePathResultType(dialogResult);
+            return result;
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(
+                PlasticLocalization.Name.EnterRestorePathFormTitle));
+
+            Paragraph(mExplanation);
+
+            DoEntryArea();
+
+            GUILayout.Space(10);
+
+            DrawProgressForDialogs.For(
+                mProgressControls.ProgressData);
+
+            DoButtonsArea();
+
+            mProgressControls.ForcedUpdateProgress(this);
+        }
+
+        void DoEntryArea()
+        {
+            GUILayout.Label(PlasticLocalization.GetString(
+                PlasticLocalization.Name.EnterRestorePathFormTextBoxExplanation),
+                EditorStyles.label);
+
+            GUILayout.BeginHorizontal();
+
+            mRestorePath = GUILayout.TextField(
+                mRestorePath, GUILayout.Width(TEXTBOX_WIDTH));
+
+            if (GUILayout.Button("...", EditorStyles.miniButton))
+            {
+                mRestorePath = (mIsDirectory) ?
+                    DoOpenFolderPanel(mRestorePath) :
+                    DoOpenFilePanel(mRestorePath);
+            }
+
+            GUILayout.EndHorizontal();
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.EnterRestorePathFormTitle);
+        }
+
+        static string DoOpenFolderPanel(string actualPath)
+        {
+            string parentDirectory = null;
+            string directoryName = null;
+
+            if (!string.IsNullOrEmpty(actualPath))
+            {
+                parentDirectory = Path.GetDirectoryName(actualPath);
+                directoryName = Path.GetFileName(actualPath);
+            }
+
+            string result = EditorUtility.SaveFolderPanel(
+                PlasticLocalization.GetString(PlasticLocalization.Name.SelectPathToRestore),
+                parentDirectory,
+                directoryName);
+
+            if (string.IsNullOrEmpty(result))
+                return actualPath;
+
+            return Path.GetFullPath(result);
+        }
+
+        static string DoOpenFilePanel(string actualPath)
+        {
+            string parentDirectory = null;
+            string fileName = null;
+            string extension = null;
+
+            if (!string.IsNullOrEmpty(actualPath))
+            {
+                parentDirectory = Path.GetDirectoryName(actualPath);
+                fileName = Path.GetFileName(actualPath);
+                extension = Path.GetExtension(actualPath);
+            }
+
+            string result = EditorUtility.SaveFilePanel(
+                PlasticLocalization.GetString(PlasticLocalization.Name.SelectPathToRestore),
+                parentDirectory,
+                fileName,
+                extension);
+
+            if (string.IsNullOrEmpty(result))
+                return actualPath;
+
+            return Path.GetFullPath(result);
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoOkButton();
+                    DoSkipButton(mShowSkipButton);
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoSkipButton(mShowSkipButton);
+                DoOkButton();
+            }
+        }
+
+        void DoOkButton()
+        {
+            if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.OkButton)))
+                return;
+
+            OkButtonWithValidationAction();
+        }
+
+        void DoSkipButton(bool showSkipButton)
+        {
+            if (!showSkipButton)
+                return;
+
+            if (!NormalButton(PlasticLocalization.GetString(PlasticLocalization.Name.SkipRestoreButton)))
+                return;
+
+            CloseButtonAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        void OkButtonWithValidationAction()
+        {
+            GetRestorePathValidation.Validation(
+                mWkPath, BuildGetRestorePathResult(),
+                this, mProgressControls);
+        }
+
+        GetRestorePathData BuildGetRestorePathResult()
+        {
+            return new GetRestorePathData(mRestorePath);
+        }
+
+        static GetRestorePathData.ResultType GetRestorePathResultType(
+            ResponseType dialogResult)
+        {
+            switch (dialogResult)
+            {
+                case ResponseType.None:
+                    return GetRestorePathData.ResultType.Skip;
+                case ResponseType.Ok:
+                    return GetRestorePathData.ResultType.OK;
+                case ResponseType.Cancel:
+                    return GetRestorePathData.ResultType.Cancel;
+            }
+
+            return GetRestorePathData.ResultType.Cancel;
+        }
+
+        static GetRestorePathDialog Create(
+            ProgressControlsForDialogs progressControls,
+            string wkPath,
+            string restorePath,
+            string explanation,
+            bool isDirectory,
+            bool showSkipButton)
+        {
+            var instance = CreateInstance<GetRestorePathDialog>();
+            instance.mWkPath = wkPath;
+            instance.mRestorePath = restorePath;
+            instance.mExplanation = explanation;
+            instance.mIsDirectory = isDirectory;
+            instance.mShowSkipButton = showSkipButton;
+            instance.mEnterKeyAction = instance.OkButtonWithValidationAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            instance.mProgressControls = progressControls;
+            return instance;
+        }
+
+        bool mIsDirectory;
+        bool mShowSkipButton;
+        string mExplanation = string.Empty;
+        string mRestorePath = string.Empty;
+        string mWkPath = string.Empty;
+
+        ProgressControlsForDialogs mProgressControls;
+
+        const float TEXTBOX_WIDTH = 520;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/Dialogs/GetRestorePathDialog.cs.meta b/Editor/PlasticSCM/Views/Diff/Dialogs/GetRestorePathDialog.cs.meta
new file mode 100644
index 0000000..fba938e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/Dialogs/GetRestorePathDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 281456381b1a4c742b0efbe305328c7a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/DiffPanel.cs b/Editor/PlasticSCM/Views/Diff/DiffPanel.cs
new file mode 100644
index 0000000..2941b95
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/DiffPanel.cs
@@ -0,0 +1,435 @@
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.Client.Commands;
+using Codice.Client.Common;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.Diff;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.Views.Diff.Dialogs;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff
+{
+    internal class DiffPanel :
+        IDiffTreeViewMenuOperations,
+        DiffTreeViewMenu.IMetaMenuOperations,
+        UndeleteClientDiffsOperation.IGetRestorePathDialog
+    {
+        internal DiffPanel(
+            WorkspaceInfo wkInfo,
+            IWorkspaceWindow workspaceWindow,
+            IViewSwitcher viewSwitcher,
+            IHistoryViewLauncher historyViewLauncher,
+            EditorWindow parentWindow)
+        {
+            mWkInfo = wkInfo;
+            mWorkspaceWindow = workspaceWindow;
+            mViewSwitcher = viewSwitcher;
+            mHistoryViewLauncher = historyViewLauncher;
+            mParentWindow = parentWindow;
+            mGuiMessage = new UnityPlasticGuiMessage(parentWindow);
+
+            BuildComponents();
+
+            mProgressControls = new ProgressControlsForViews();
+        }
+
+        internal void ClearInfo()
+        {
+            ClearData();
+
+            mParentWindow.Repaint();
+        }
+
+        internal void UpdateInfo(
+            MountPointWithPath mountWithPath,
+            ChangesetInfo csetInfo)
+        {
+            FillData(mountWithPath, csetInfo);
+
+            mParentWindow.Repaint();
+        }
+
+        internal void OnDisable()
+        {
+            mSearchField.downOrUpArrowKeyPressed -=
+                SearchField_OnDownOrUpArrowKeyPressed;
+        }
+
+        internal void Update()
+        {
+            mProgressControls.UpdateProgress(mParentWindow);
+        }
+
+        internal void OnGUI()
+        {
+            EditorGUILayout.BeginVertical();
+
+            DoActionsToolbar(
+                mDiffs,
+                mProgressControls,
+                GetHeaderLabelText(mSelectedChangesetInfo),
+                mIsSkipMergeTrackingButtonVisible,
+                mIsSkipMergeTrackingButtonChecked,
+                mSearchField,
+                mDiffTreeView);
+
+            DoDiffTreeViewArea(
+                mDiffTreeView,
+                mProgressControls.IsOperationRunning());
+
+            if (mProgressControls.HasNotification())
+            {
+                DrawProgressForViews.ForNotificationArea(
+                    mProgressControls.ProgressData);
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        SelectedDiffsGroupInfo IDiffTreeViewMenuOperations.GetSelectedDiffsGroupInfo()
+        {
+            return SelectedDiffsGroupInfo.BuildFromSelectedNodes(
+                DiffSelection.GetSelectedDiffsWithoutMeta(mDiffTreeView));
+        }
+
+        void IDiffTreeViewMenuOperations.Diff()
+        {
+            ClientDiffInfo clientDiffInfo =
+                DiffSelection.GetSelectedDiff(mDiffTreeView);
+
+            DiffOperation.DiffClientDiff(
+                mWkInfo,
+                clientDiffInfo.DiffWithMount.Mount.Mount,
+                clientDiffInfo.DiffWithMount.Difference,
+                xDiffLauncher: null,
+                imageDiffLauncher: null);
+        }
+
+        void IDiffTreeViewMenuOperations.History()
+        {
+            ClientDiffInfo clientDiffInfo =
+                DiffSelection.GetSelectedDiff(mDiffTreeView);
+
+            mHistoryViewLauncher.ShowHistoryView(
+                clientDiffInfo.DiffWithMount.Mount.RepSpec,
+                clientDiffInfo.DiffWithMount.Difference.RevInfo.ItemId,
+                clientDiffInfo.DiffWithMount.Difference.Path,
+                clientDiffInfo.DiffWithMount.Difference.IsDirectory);
+        }
+
+        void IDiffTreeViewMenuOperations.RevertChanges()
+        {
+            RevertClientDiffsOperation.RevertChanges(
+                mWkInfo,
+                DiffSelection.GetSelectedDiffs(mDiffTreeView),
+                mWorkspaceWindow,
+                mProgressControls,
+                mGuiMessage,
+                AfterRevertOrUndeleteOperation);
+        }
+
+        void IDiffTreeViewMenuOperations.Undelete()
+        {
+            UndeleteClientDiffsOperation.Undelete(
+                mWkInfo,
+                DiffSelection.GetSelectedDiffs(mDiffTreeView),
+                mWorkspaceWindow,
+                mProgressControls,
+                this,
+                mGuiMessage,
+                AfterRevertOrUndeleteOperation);
+        }
+
+        void IDiffTreeViewMenuOperations.UndeleteToSpecifiedPaths()
+        {
+            UndeleteClientDiffsOperation.UndeleteToSpecifiedPaths(
+                mWkInfo,
+                DiffSelection.GetSelectedDiffs(mDiffTreeView),
+                mWorkspaceWindow,
+                mProgressControls,
+                this,
+                mGuiMessage,
+                AfterRevertOrUndeleteOperation);
+        }
+
+        bool DiffTreeViewMenu.IMetaMenuOperations.SelectionHasMeta()
+        {
+            return mDiffTreeView.SelectionHasMeta();
+        }
+
+        void DiffTreeViewMenu.IMetaMenuOperations.DiffMeta()
+        {
+            ClientDiffInfo clientDiffInfo =
+                DiffSelection.GetSelectedDiff(mDiffTreeView);
+
+            ClientDiffInfo clientDiffInfoMeta =
+                mDiffTreeView.GetMetaDiff(clientDiffInfo);
+
+            DiffOperation.DiffClientDiff(
+                mWkInfo,
+                clientDiffInfoMeta.DiffWithMount.Mount.Mount,
+                clientDiffInfoMeta.DiffWithMount.Difference,
+                xDiffLauncher: null,
+                imageDiffLauncher: null);
+        }
+
+        GetRestorePathData 
+            UndeleteClientDiffsOperation.IGetRestorePathDialog.GetRestorePath(
+                string wkPath, string restorePath, string explanation,
+                bool isDirectory, bool showSkipButton)
+        {
+            return GetRestorePathDialog.GetRestorePath(
+                wkPath, restorePath, explanation, isDirectory,
+                showSkipButton, mParentWindow);
+        }
+
+        void DiffTreeViewMenu.IMetaMenuOperations.HistoryMeta()
+        {
+            ClientDiffInfo clientDiffInfo =
+                DiffSelection.GetSelectedDiff(mDiffTreeView);
+
+            ClientDiffInfo clientDiffInfoMeta =
+                mDiffTreeView.GetMetaDiff(clientDiffInfo);
+
+            mHistoryViewLauncher.ShowHistoryView(
+                clientDiffInfoMeta.DiffWithMount.Mount.RepSpec,
+                clientDiffInfoMeta.DiffWithMount.Difference.RevInfo.ItemId,
+                clientDiffInfoMeta.DiffWithMount.Difference.Path,
+                clientDiffInfoMeta.DiffWithMount.Difference.IsDirectory);
+        }
+
+        void SearchField_OnDownOrUpArrowKeyPressed()
+        {
+            mDiffTreeView.SetFocusAndEnsureSelectedItem();
+        }
+
+        void AfterRevertOrUndeleteOperation()
+        {
+            RefreshAsset.UnityAssetDatabase();
+
+            mViewSwitcher.ShowPendingChanges();
+        }
+
+        void ClearData()
+        {
+            mSelectedMountWithPath = null;
+            mSelectedChangesetInfo = null;
+
+            mDiffs = null;
+
+            ClearDiffs();
+        }
+
+        void FillData(
+            MountPointWithPath mountWithPath,
+            ChangesetInfo csetInfo)
+        {
+            mSelectedMountWithPath = mountWithPath;
+            mSelectedChangesetInfo = csetInfo;
+
+            ((IProgressControls)mProgressControls).ShowProgress(
+                PlasticLocalization.GetString(PlasticLocalization.Name.Loading));
+
+            mIsSkipMergeTrackingButtonVisible = false;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(100);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    mDiffs = Plastic.API.GetChangesetDifferences(
+                        mountWithPath, csetInfo);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    ((IProgressControls)mProgressControls).HideProgress();
+
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.DisplayException(waiter.Exception);
+                        return;
+                    }
+
+                    if (mSelectedMountWithPath != mountWithPath ||
+                        mSelectedChangesetInfo != csetInfo)
+                        return;
+
+                    if (mDiffs == null || mDiffs.Count == 0)
+                    {
+                        ClearDiffs();
+                        return;
+                    }
+
+                    mIsSkipMergeTrackingButtonVisible =
+                        ClientDiffList.HasMerges(mDiffs);
+
+                    bool skipMergeTracking =
+                        mIsSkipMergeTrackingButtonVisible &&
+                        mIsSkipMergeTrackingButtonChecked;
+
+                    UpdateDiffTreeView(
+                        mDiffs, skipMergeTracking, mDiffTreeView);
+                });
+        }
+
+        void ClearDiffs()
+        {
+            mIsSkipMergeTrackingButtonVisible = false;
+
+            ClearDiffTreeView(mDiffTreeView);
+
+            ((IProgressControls)mProgressControls).ShowNotification(
+                PlasticLocalization.GetString(PlasticLocalization.Name.NoContentToCompare));
+        }
+
+        static void ClearDiffTreeView(
+            DiffTreeView diffTreeView)
+        {
+            diffTreeView.ClearModel();
+
+            diffTreeView.Reload();
+        }
+
+        static void UpdateDiffTreeView(
+            List<ClientDiff> diffs,
+            bool skipMergeTracking,
+            DiffTreeView diffTreeView)
+        {
+            diffTreeView.BuildModel(
+                diffs, skipMergeTracking);
+
+            diffTreeView.Refilter();
+
+            diffTreeView.Sort();
+
+            diffTreeView.Reload();
+        }
+
+        static string GetHeaderLabelText(
+            ChangesetInfo changesetInfo)
+        {
+            if (changesetInfo == null)
+                return PlasticLocalization.GetString(PlasticLocalization.Name.ChangesLabelPlural);
+
+            return string.Format(
+                PlasticLocalization.GetString(PlasticLocalization.Name.ChangesOfChangeset),
+                changesetInfo.ChangesetId);
+        }
+
+        void DoActionsToolbar(
+            List<ClientDiff> diffs,
+            ProgressControlsForViews progressControls,
+            string headerLabelText,
+            bool isSkipMergeTrackingButtonVisible,
+            bool isSkipMergeTrackingButtonChecked,
+            SearchField searchField,
+            DiffTreeView diffTreeView)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            GUILayout.Label(headerLabelText,
+                UnityStyles.DiffPanel.HeaderLabel);
+
+            if (progressControls.IsOperationRunning())
+            {
+                DrawProgressForViews.ForIndeterminateProgress(
+                    progressControls.ProgressData);
+            }
+
+            GUILayout.FlexibleSpace();
+
+            if (isSkipMergeTrackingButtonVisible)
+            {
+                DoSkipMergeTrackingButton(
+                    diffs,
+                    isSkipMergeTrackingButtonChecked,
+                    diffTreeView);
+            }
+
+            DrawSearchField.For(
+                searchField,
+                diffTreeView,
+                UnityConstants.SEARCH_FIELD_WIDTH);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void DoSkipMergeTrackingButton(
+            List<ClientDiff> diffs,
+            bool isSkipMergeTrackingButtonChecked,
+            DiffTreeView diffTreeView)
+        {
+            bool wasChecked = isSkipMergeTrackingButtonChecked;
+
+            GUIContent buttonContent = new GUIContent(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.SkipDiffMergeTracking));
+
+            GUIStyle buttonStyle = EditorStyles.toolbarButton;
+
+            float buttonWidth = buttonStyle.CalcSize(buttonContent).x + 10;
+
+            Rect toggleRect = GUILayoutUtility.GetRect(
+                buttonContent, buttonStyle, GUILayout.Width(buttonWidth));
+
+            bool isChecked = GUI.Toggle(
+                toggleRect, wasChecked, buttonContent, buttonStyle);
+
+            if (wasChecked == isChecked)
+                return;
+
+            UpdateDiffTreeView(diffs, isChecked, diffTreeView);
+
+            mIsSkipMergeTrackingButtonChecked = isChecked;
+        }
+
+        static void DoDiffTreeViewArea(
+            DiffTreeView diffTreeView,
+            bool isOperationRunning)
+        {
+            GUI.enabled = !isOperationRunning;
+
+            Rect rect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            diffTreeView.OnGUI(rect);
+
+            GUI.enabled = true;
+        }
+
+        void BuildComponents()
+        {
+            mSearchField = new SearchField();
+            mSearchField.downOrUpArrowKeyPressed += SearchField_OnDownOrUpArrowKeyPressed;
+
+            mDiffTreeView = new DiffTreeView(
+                new DiffTreeViewMenu(this, this));
+            mDiffTreeView.Reload();
+        }
+
+        volatile List<ClientDiff> mDiffs;
+
+        bool mIsSkipMergeTrackingButtonVisible;
+        bool mIsSkipMergeTrackingButtonChecked;
+
+        SearchField mSearchField;
+        DiffTreeView mDiffTreeView;
+
+        ChangesetInfo mSelectedChangesetInfo;
+        MountPointWithPath mSelectedMountWithPath;
+
+        readonly ProgressControlsForViews mProgressControls;
+        readonly GuiMessage.IGuiMessage mGuiMessage;
+        readonly EditorWindow mParentWindow;
+        readonly IWorkspaceWindow mWorkspaceWindow;
+        readonly IHistoryViewLauncher mHistoryViewLauncher;
+        readonly IViewSwitcher mViewSwitcher;
+        readonly WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/DiffPanel.cs.meta b/Editor/PlasticSCM/Views/Diff/DiffPanel.cs.meta
new file mode 100644
index 0000000..59248a4
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/DiffPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0ee79162e06c6984a97600b7c0680611
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/DiffSelection.cs b/Editor/PlasticSCM/Views/Diff/DiffSelection.cs
new file mode 100644
index 0000000..18eab06
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/DiffSelection.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+
+using PlasticGui.WorkspaceWindow.Diff;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff
+{
+    internal static class DiffSelection
+    {
+        internal static List<ClientDiffInfo> GetSelectedDiffs(
+            DiffTreeView treeView)
+        {
+            return treeView.GetSelectedDiffs(true);
+        }
+
+        internal static List<ClientDiffInfo> GetSelectedDiffsWithoutMeta(
+            DiffTreeView treeView)
+        {
+            return treeView.GetSelectedDiffs(false);
+        }
+
+        internal static ClientDiffInfo GetSelectedDiff(
+            DiffTreeView treeView)
+        {
+            if (!treeView.HasSelection())
+                return null;
+
+            return treeView.GetSelectedDiffs(false)[0];
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/DiffSelection.cs.meta b/Editor/PlasticSCM/Views/Diff/DiffSelection.cs.meta
new file mode 100644
index 0000000..d85df2d
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/DiffSelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4ef5fb54cd29b40468eaf5a14e9845ed
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/DiffTreeView.cs b/Editor/PlasticSCM/Views/Diff/DiffTreeView.cs
new file mode 100644
index 0000000..9beb9f3
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/DiffTreeView.cs
@@ -0,0 +1,492 @@
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.Client.Commands;
+using Codice.Utils;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.Diff;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff
+{
+    internal class DiffTreeView : TreeView
+    {
+        internal DiffTreeView(DiffTreeViewMenu menu)
+            : base(new TreeViewState())
+        {
+            mMenu = menu;
+
+            customFoldoutYOffset = UnityConstants.TREEVIEW_FOLDOUT_Y_OFFSET;
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+
+            mCooldownFilterAction = new CooldownWindowDelayer(
+                DelayedSearchChanged, UnityConstants.SEARCH_DELAYED_INPUT_ACTION_INTERVAL);
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        public override void OnGUI(Rect rect)
+        {
+            base.OnGUI(rect);
+
+            Event e = Event.current;
+
+            if (e.type != EventType.KeyDown)
+                return;
+
+            bool isProcessed = mMenu.ProcessKeyActionIfNeeded(e);
+
+            if (isProcessed)
+                e.Use();
+        }
+
+        protected override bool CanChangeExpandedState(TreeViewItem item)
+        {
+            return item is ChangeCategoryTreeViewItem
+                || item is MergeCategoryTreeViewItem;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem rootItem)
+        {
+            try
+            {
+                RegenerateRows(
+                    mDiffTree,
+                    mTreeViewItemIds,
+                    this,
+                    rootItem,
+                    mRows,
+                    mExpandCategories);
+            }
+            finally
+            {
+                mExpandCategories = false;
+            }
+
+            return mRows;
+        }
+
+        protected override void CommandEventHandling()
+        {
+            // NOTE - empty override to prevent crash when pressing ctrl-a in the treeview
+        }
+
+        protected override void SearchChanged(string newSearch)
+        {
+            mCooldownFilterAction.Ping();
+        }
+
+        protected override void ContextClickedItem(int id)
+        {
+            mMenu.Popup();
+            Repaint();
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            DrawTreeViewItem.InitializeStyles();
+
+            if (args.item is MergeCategoryTreeViewItem)
+            {
+                MergeCategoryTreeViewItemGUI(
+                    args.rowRect,
+                    rowHeight,
+                    (MergeCategoryTreeViewItem)args.item,
+                    args.selected,
+                    args.focused);
+                return;
+            }
+
+            if (args.item is ChangeCategoryTreeViewItem)
+            {
+                ChangeCategoryTreeViewItemGUI(
+                    args.rowRect,
+                    rowHeight,
+                    (ChangeCategoryTreeViewItem)args.item,
+                    args.selected,
+                    args.focused);
+                return;
+            }
+
+            if (args.item is ClientDiffTreeViewItem)
+            {
+                ClientDiffTreeViewItemGUI(
+                    args.rowRect,
+                    rowHeight,
+                    mDiffTree,
+                    (ClientDiffTreeViewItem)args.item,
+                    args.selected,
+                    args.focused);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        internal void ClearModel()
+        {
+            mTreeViewItemIds.Clear();
+
+            mDiffTree = new UnityDiffTree();
+        }
+
+        internal void BuildModel(
+            List<ClientDiff> diffs,
+            bool skipMergeTracking)
+        {
+            mTreeViewItemIds.Clear();
+
+            mDiffTree.BuildCategories(diffs, skipMergeTracking);
+        }
+
+        internal void Refilter()
+        {
+            Filter filter = new Filter(searchString);
+            mDiffTree.Filter(filter, ColumnsNames);
+
+            mExpandCategories = true;
+        }
+
+        internal void Sort()
+        {
+            mDiffTree.Sort(
+                PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn),
+                sortAscending: true);
+        }
+
+        internal ClientDiffInfo GetMetaDiff(ClientDiffInfo diff)
+        {
+            return mDiffTree.GetMetaDiff(diff);
+        }
+
+        internal bool SelectionHasMeta()
+        {
+            if (!HasSelection())
+                return false;
+
+            ClientDiffInfo selectedDiff = GetSelectedDiffs(false)[0];
+
+            if (selectedDiff == null)
+                return false;
+
+            return mDiffTree.HasMeta(selectedDiff);
+        }
+
+        internal List<ClientDiffInfo> GetSelectedDiffs(bool includeMetaFiles)
+        {
+            List<ClientDiffInfo> result = new List<ClientDiffInfo>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<ITreeViewNode, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                if (!(item.Key is ClientDiffInfo))
+                    continue;
+
+                result.Add((ClientDiffInfo)item.Key);
+            }
+
+            if (includeMetaFiles)
+                mDiffTree.FillWithMeta(result);
+
+            return result;
+        }
+
+        void DelayedSearchChanged()
+        {
+            Refilter();
+
+            Sort();
+
+            Reload();
+
+            TableViewOperations.ScrollToSelection(this);
+        }
+
+        static void RegenerateRows(
+            UnityDiffTree diffTree,
+            TreeViewItemIds<IDiffCategory, ITreeViewNode> treeViewItemIds,
+            TreeView treeView,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows,
+            bool expandCategories)
+        {
+            ClearRows(rootItem, rows);
+
+            List<IDiffCategory> categories = diffTree.GetNodes();
+
+            if (categories == null)
+                return;
+
+            foreach (IDiffCategory category in categories)
+            {
+                if (category is MergeCategory)
+                {
+                    AddMergeCategory(
+                        rootItem,
+                        category,
+                        rows,
+                        treeViewItemIds,
+                        treeView,
+                        expandCategories);
+                }
+
+                if (category is ChangeCategory)
+                {
+                    AddChangeCategory(
+                        rootItem,
+                        category,
+                        rows,
+                        treeViewItemIds,
+                        treeView,
+                        expandCategories);
+                }
+            }
+
+            if (!expandCategories)
+                return;
+
+            treeView.state.expandedIDs = treeViewItemIds.GetCategoryIds();
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static void AddMergeCategory(
+            TreeViewItem rootItem,
+            IDiffCategory category,
+            List<TreeViewItem> rows,
+            TreeViewItemIds<IDiffCategory, ITreeViewNode> treeViewItemIds,
+            TreeView treeView,
+            bool expandCategories)
+        {
+            int categoryId;
+            if (!treeViewItemIds.TryGetCategoryItemId(category, out categoryId))
+                categoryId = treeViewItemIds.AddCategoryItem(category);
+
+            MergeCategoryTreeViewItem mergeCategoryTreeViewItem =
+                new MergeCategoryTreeViewItem(
+                    categoryId,
+                    rootItem.depth + 1,
+                    (MergeCategory)category);
+
+            rootItem.AddChild(mergeCategoryTreeViewItem);
+            rows.Add(mergeCategoryTreeViewItem);
+
+            if (!expandCategories &&
+                !treeView.IsExpanded(mergeCategoryTreeViewItem.id))
+                return;
+
+            for (int i = 0; i < category.GetChildrenCount(); i++)
+            {
+                IDiffCategory child = (IDiffCategory)((ITreeViewNode)category)
+                    .GetChild(i);
+
+                AddChangeCategory(
+                    mergeCategoryTreeViewItem,
+                    child,
+                    rows,
+                    treeViewItemIds,
+                    treeView,
+                    expandCategories);
+            }
+        }
+
+        static void AddChangeCategory(
+            TreeViewItem parentItem,
+            IDiffCategory category,
+            List<TreeViewItem> rows,
+            TreeViewItemIds<IDiffCategory, ITreeViewNode> treeViewItemIds,
+            TreeView treeView,
+            bool expandCategories)
+        {
+            int categoryId;
+            if (!treeViewItemIds.TryGetCategoryItemId(category, out categoryId))
+                categoryId = treeViewItemIds.AddCategoryItem(category);
+
+            ChangeCategoryTreeViewItem changeCategoryTreeViewItem =
+                new ChangeCategoryTreeViewItem(
+                    categoryId,
+                    parentItem.depth + 1,
+                    (ChangeCategory)category);
+
+            parentItem.AddChild(changeCategoryTreeViewItem);
+            rows.Add(changeCategoryTreeViewItem);
+
+            if (!expandCategories &&
+                !treeView.IsExpanded(changeCategoryTreeViewItem.id))
+                return;
+
+            AddClientDiffs(
+                changeCategoryTreeViewItem,
+                (ITreeViewNode)category,
+                rows,
+                treeViewItemIds);
+        }
+
+        static void AddClientDiffs(
+            TreeViewItem parentItem,
+            ITreeViewNode parentNode,
+            List<TreeViewItem> rows,
+            TreeViewItemIds<IDiffCategory, ITreeViewNode> treeViewItemIds)
+        {
+            for (int i = 0; i < parentNode.GetChildrenCount(); i++)
+            {
+                ITreeViewNode child = parentNode.GetChild(i);
+
+                int nodeId;
+                if (!treeViewItemIds.TryGetInfoItemId(child, out nodeId))
+                    nodeId = treeViewItemIds.AddInfoItem(child);
+
+                TreeViewItem changeTreeViewItem =
+                    new ClientDiffTreeViewItem(
+                        nodeId,
+                        parentItem.depth + 1,
+                        (ClientDiffInfo)child);
+
+                parentItem.AddChild(changeTreeViewItem);
+                rows.Add(changeTreeViewItem);
+            }
+        }
+
+        static void MergeCategoryTreeViewItemGUI(
+            Rect rowRect,
+            float rowHeight,
+            MergeCategoryTreeViewItem item,
+            bool isSelected,
+            bool isFocused)
+        {
+            Texture icon = Images.GetImage(Images.Name.IconMergeCategory);
+            string label = item.Category.GetHeaderText();
+
+            DrawTreeViewItem.ForCategoryItem(
+                rowRect,
+                rowHeight,
+                item.depth,
+                icon, label,
+                isSelected,
+                isFocused);
+        }
+
+        static void ChangeCategoryTreeViewItemGUI(
+            Rect rowRect,
+            float rowHeight,
+            ChangeCategoryTreeViewItem item,
+            bool isSelected,
+            bool isFocused)
+        {
+            Texture icon = GetChangeCategoryIcon(item.Category);
+            string label = item.Category.GetHeaderText();
+
+            DrawTreeViewItem.ForCategoryItem(
+                rowRect,
+                rowHeight,
+                item.depth,
+                icon, label,
+                isSelected,
+                isFocused);
+        }
+
+        static void ClientDiffTreeViewItemGUI(
+            Rect rowRect,
+            float rowHeight,
+            UnityDiffTree diffTree,
+            ClientDiffTreeViewItem item,
+            bool isSelected,
+            bool isFocused)
+        {
+            string label = ClientDiffView.GetColumnText(
+                item.Difference.DiffWithMount.Mount.RepSpec,
+                item.Difference.DiffWithMount.Difference,
+                PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn));
+
+            if (diffTree.HasMeta(item.Difference))
+                label = string.Concat(label, UnityConstants.TREEVIEW_META_LABEL);
+
+            Texture icon = GetClientDiffIcon(
+                item.Difference.DiffWithMount.Difference.IsDirectory,
+                label);
+
+            DrawTreeViewItem.ForItemCell(
+                rowRect,
+                rowHeight,
+                item.depth,
+                icon,
+                null,
+                label,
+                isSelected,
+                isFocused,
+                false,
+                false);
+        }
+
+        static Texture GetChangeCategoryIcon(ChangeCategory category)
+        {
+            switch (category.Type)
+            {
+                case ChangeCategoryType.Merged:
+                    return Images.GetImage(Images.Name.IconMerged);
+                case ChangeCategoryType.Changed:
+                    return Images.GetImage(Images.Name.IconChanged);
+                case ChangeCategoryType.Moved:
+                    return Images.GetImage(Images.Name.IconMoved);
+                case ChangeCategoryType.Deleted:
+                    return Images.GetImage(Images.Name.IconDeleted);
+                case ChangeCategoryType.FSProtection:
+                    return Images.GetImage(Images.Name.IconFsChanged);
+                case ChangeCategoryType.Added:
+                    return Images.GetImage(Images.Name.IconAdded);
+                default:
+                    return null;
+            }
+        }
+
+        static Texture GetClientDiffIcon(bool isDirectory, string path)
+        {
+            if (isDirectory)
+                return Images.GetDirectoryIcon();
+
+            return Images.GetFileIconFromCmPath(path);
+        }
+
+        bool mExpandCategories;
+
+        TreeViewItemIds<IDiffCategory, ITreeViewNode> mTreeViewItemIds =
+            new TreeViewItemIds<IDiffCategory, ITreeViewNode>();
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        UnityDiffTree mDiffTree = new UnityDiffTree();
+
+        readonly CooldownWindowDelayer mCooldownFilterAction;
+
+        static readonly List<string> ColumnsNames = new List<string> {
+            PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn)};
+        readonly DiffTreeViewMenu mMenu;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/DiffTreeView.cs.meta b/Editor/PlasticSCM/Views/Diff/DiffTreeView.cs.meta
new file mode 100644
index 0000000..75cc516
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/DiffTreeView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ba4e6e12f66973142a87299287cb34dc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/DiffTreeViewMenu.cs b/Editor/PlasticSCM/Views/Diff/DiffTreeViewMenu.cs
new file mode 100644
index 0000000..63bf344
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/DiffTreeViewMenu.cs
@@ -0,0 +1,282 @@
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.Diff;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff
+{
+    internal class DiffTreeViewMenu
+    {
+        internal interface IMetaMenuOperations
+        {
+            bool SelectionHasMeta();
+            void DiffMeta();
+            void HistoryMeta();
+        }
+
+        internal DiffTreeViewMenu(
+            IDiffTreeViewMenuOperations operations,
+            IMetaMenuOperations metaMenuOperations)
+        {
+            mOperations = operations;
+            mMetaMenuOperations = metaMenuOperations;
+
+            BuildComponents();
+        }
+
+        internal void Popup()
+        {
+            GenericMenu menu = new GenericMenu();
+
+            UpdateMenuItems(menu);
+
+            menu.ShowAsContext();
+        }
+
+        internal bool ProcessKeyActionIfNeeded(Event e)
+        {
+            DiffTreeViewMenuOperations operationToExecute = GetMenuOperation(e);
+
+            if (operationToExecute == DiffTreeViewMenuOperations.None)
+                return false;
+
+            SelectedDiffsGroupInfo info =
+                mOperations.GetSelectedDiffsGroupInfo();
+
+            DiffTreeViewMenuOperations operations =
+                DiffTreeViewMenuUpdater.GetAvailableMenuOperations(info);
+
+            if (!operations.HasFlag(operationToExecute))
+                return false;
+
+            ProcessMenuOperation(operationToExecute, mOperations);
+            return true;
+        }
+
+        void DiffMenuItem_Click()
+        {
+            mOperations.Diff();
+        }
+
+        void DiffMetaMenuItem_Click()
+        {
+            mMetaMenuOperations.DiffMeta();
+        }
+
+        void HistoryMenuItem_Click()
+        {
+            mOperations.History();
+        }
+
+        void HistoryMetaMenuItem_Click()
+        {
+            mMetaMenuOperations.HistoryMeta();
+        }
+
+        void RevertMenuItem_Click()
+        {
+            mOperations.RevertChanges();
+        }
+
+        void UndeleteMenuItem_Click()
+        {
+            mOperations.Undelete();
+        }
+
+        void UndeleteToSpecifiedPathMenuItem_Click()
+        {
+            mOperations.UndeleteToSpecifiedPaths();
+        }
+
+        void UpdateMenuItems(GenericMenu menu)
+        {
+            SelectedDiffsGroupInfo groupInfo =
+                mOperations.GetSelectedDiffsGroupInfo();
+
+            DiffTreeViewMenuOperations operations =
+                DiffTreeViewMenuUpdater.GetAvailableMenuOperations(groupInfo);
+
+            if (operations == DiffTreeViewMenuOperations.None)
+            {
+                menu.AddDisabledItem(GetNoActionMenuItemContent());
+                return;
+            }
+
+            bool isMultipleSelection = groupInfo.SelectedItemsCount > 1;
+            bool selectionHasMeta = mMetaMenuOperations.SelectionHasMeta();
+
+            if (operations.HasFlag(DiffTreeViewMenuOperations.Diff))
+                menu.AddItem(mDiffMenuItemContent, false, DiffMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffMenuItemContent, false);
+
+            if (mMetaMenuOperations.SelectionHasMeta())
+            {
+                if (operations.HasFlag(DiffTreeViewMenuOperations.Diff))
+                    menu.AddItem(mDiffMetaMenuItemContent, false, DiffMetaMenuItem_Click);
+                else
+                    menu.AddDisabledItem(mDiffMetaMenuItemContent);
+            }
+
+            menu.AddSeparator(string.Empty);
+
+            if (operations.HasFlag(DiffTreeViewMenuOperations.History))
+                menu.AddItem(mViewHistoryMenuItemContent, false, HistoryMenuItem_Click);
+            else
+                menu.AddDisabledItem(mViewHistoryMenuItemContent, false);
+
+            if (mMetaMenuOperations.SelectionHasMeta())
+            {
+                if (operations.HasFlag(DiffTreeViewMenuOperations.History))
+                    menu.AddItem(mViewHistoryMetaMenuItemContent, false, HistoryMetaMenuItem_Click);
+                else
+                    menu.AddDisabledItem(mViewHistoryMetaMenuItemContent, false);
+            }
+
+            if (operations.HasFlag(DiffTreeViewMenuOperations.RevertChanges))
+            {
+                menu.AddSeparator(string.Empty);
+
+                mRevertMenuItemContent.text = GetRevertMenuItemText(
+                    isMultipleSelection,
+                    selectionHasMeta);
+
+                menu.AddItem(mRevertMenuItemContent, false, RevertMenuItem_Click);
+            }
+
+            if (operations.HasFlag(DiffTreeViewMenuOperations.Undelete) ||
+                operations.HasFlag(DiffTreeViewMenuOperations.UndeleteToSpecifiedPaths))
+            {
+                menu.AddSeparator(string.Empty);
+            }
+
+            if (operations.HasFlag(DiffTreeViewMenuOperations.Undelete))
+            {
+                mUndeleteMenuItemContent.text = GetUndeleteMenuItemText(
+                    isMultipleSelection,
+                    selectionHasMeta);
+
+                menu.AddItem(mUndeleteMenuItemContent, false, UndeleteMenuItem_Click);
+            }
+
+            if (operations.HasFlag(DiffTreeViewMenuOperations.UndeleteToSpecifiedPaths))
+            {
+                mUndeleteToSpecifiedPathMenuItemContent.text = GetUndeleteToSpecifiedPathMenuItemText(
+                    isMultipleSelection,
+                    selectionHasMeta);
+
+                menu.AddItem(mUndeleteToSpecifiedPathMenuItemContent, false, UndeleteToSpecifiedPathMenuItem_Click);
+            }
+        }
+
+        GUIContent GetNoActionMenuItemContent()
+        {
+            if (mNoActionMenuItemContent == null)
+            {
+                mNoActionMenuItemContent = new GUIContent(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.NoActionMenuItem));
+            }
+
+            return mNoActionMenuItemContent;
+        }
+
+        static string GetRevertMenuItemText(
+            bool isMultipleSelection,
+            bool selectionHasMeta)
+        {
+            if (selectionHasMeta && !isMultipleSelection)
+                return PlasticLocalization.GetString(PlasticLocalization.Name.UndoThisChangePlusMeta);
+
+            return isMultipleSelection ?
+                PlasticLocalization.GetString(PlasticLocalization.Name.UndoSelectedChanges) :
+                PlasticLocalization.GetString(PlasticLocalization.Name.UndoThisChange);
+        }
+
+        static string GetUndeleteMenuItemText(
+            bool isMultipleSelection,
+            bool selectionHasMeta)
+        {
+            if (selectionHasMeta && !isMultipleSelection)
+                return PlasticLocalization.GetString(PlasticLocalization.Name.UndeleteRevisionPlusMeta);
+
+            return isMultipleSelection ?
+                PlasticLocalization.GetString(PlasticLocalization.Name.UndeleteSelectedRevisions) :
+                PlasticLocalization.GetString(PlasticLocalization.Name.UndeleteRevisions);
+        }
+
+        static string GetUndeleteToSpecifiedPathMenuItemText(
+            bool isMultipleSelection,
+            bool selectionHasMeta)
+        {
+            if (selectionHasMeta && !isMultipleSelection)
+                return PlasticLocalization.GetString(PlasticLocalization.Name.UndeleteRevisionPlusMetaPath);
+
+            return isMultipleSelection ?
+                PlasticLocalization.GetString(PlasticLocalization.Name.UndeleteSelectedRevisionsPaths) :
+                PlasticLocalization.GetString(PlasticLocalization.Name.UndeleteRevisionPath);
+        }
+
+        static void ProcessMenuOperation(
+            DiffTreeViewMenuOperations operationToExecute,
+            IDiffTreeViewMenuOperations operations)
+        {
+            if (operationToExecute == DiffTreeViewMenuOperations.Diff)
+            {
+                operations.Diff();
+                return;
+            }
+
+            if (operationToExecute == DiffTreeViewMenuOperations.History)
+            {
+                operations.History();
+                return;
+            }
+        }
+
+        static DiffTreeViewMenuOperations GetMenuOperation(Event e)
+        {
+            if (Keyboard.IsControlOrCommandKeyPressed(e) && Keyboard.IsKeyPressed(e, KeyCode.D))
+                return DiffTreeViewMenuOperations.Diff;
+
+            if (Keyboard.IsControlOrCommandKeyPressed(e) && Keyboard.IsKeyPressed(e, KeyCode.H))
+                return DiffTreeViewMenuOperations.History;
+
+            return DiffTreeViewMenuOperations.None;
+        }
+
+        void BuildComponents()
+        {
+            mDiffMenuItemContent = new GUIContent(
+                string.Format("{0} {1}",
+                    PlasticLocalization.GetString(PlasticLocalization.Name.DiffMenuItem),
+                    GetPlasticShortcut.ForDiff()));
+            mDiffMetaMenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.DiffMetaMenuItem));
+            mViewHistoryMenuItemContent = new GUIContent(
+                string.Format("{0} {1}",
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ViewHistoryMenuItem),
+                    GetPlasticShortcut.ForHistory()));
+            mViewHistoryMetaMenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.ViewHistoryMetaMenuItem));
+            mRevertMenuItemContent = new GUIContent();
+            mUndeleteMenuItemContent = new GUIContent();
+            mUndeleteToSpecifiedPathMenuItemContent = new GUIContent();
+        }
+
+        GUIContent mNoActionMenuItemContent;
+
+        GUIContent mDiffMenuItemContent;
+        GUIContent mDiffMetaMenuItemContent;
+        GUIContent mViewHistoryMenuItemContent;
+        GUIContent mViewHistoryMetaMenuItemContent;
+        GUIContent mRevertMenuItemContent;
+        GUIContent mUndeleteMenuItemContent;
+        GUIContent mUndeleteToSpecifiedPathMenuItemContent;
+
+        readonly IDiffTreeViewMenuOperations mOperations;
+        readonly IMetaMenuOperations mMetaMenuOperations;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/DiffTreeViewMenu.cs.meta b/Editor/PlasticSCM/Views/Diff/DiffTreeViewMenu.cs.meta
new file mode 100644
index 0000000..ae263bc
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/DiffTreeViewMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2c9c0041347ae4e4cb794a3da850fa79
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/GetClientDiffInfos.cs b/Editor/PlasticSCM/Views/Diff/GetClientDiffInfos.cs
new file mode 100644
index 0000000..6d9fbbd
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/GetClientDiffInfos.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+
+using Codice.Utils;
+using PlasticGui.WorkspaceWindow.Diff;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff
+{
+    internal static class GetClientDiffInfos
+    {
+        internal static List<ClientDiffInfo> FromCategories(List<IDiffCategory> categories)
+        {
+            List<ClientDiffInfo> result = new List<ClientDiffInfo>();
+
+            foreach (ITreeViewNode node in categories)
+                AddClientDiffInfos(node, result);
+
+            return result;
+        }
+
+        static void AddClientDiffInfos(ITreeViewNode node, List<ClientDiffInfo> result)
+        {
+            if (node is ClientDiffInfo)
+            {
+                result.Add((ClientDiffInfo)node);
+                return;
+            }
+
+            for (int i = 0; i < node.GetChildrenCount(); i++)
+                AddClientDiffInfos(node.GetChild(i), result);
+
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/GetClientDiffInfos.cs.meta b/Editor/PlasticSCM/Views/Diff/GetClientDiffInfos.cs.meta
new file mode 100644
index 0000000..654a36e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/GetClientDiffInfos.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5ab43506dddfc244ab5b44585140c5a6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/MergeCategoryTreeViewItem.cs b/Editor/PlasticSCM/Views/Diff/MergeCategoryTreeViewItem.cs
new file mode 100644
index 0000000..c6cefdd
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/MergeCategoryTreeViewItem.cs
@@ -0,0 +1,18 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui.WorkspaceWindow.Diff;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff
+{
+    internal class MergeCategoryTreeViewItem : TreeViewItem
+    {
+        internal MergeCategory Category { get; private set; }
+
+        internal MergeCategoryTreeViewItem(
+            int id, int depth, MergeCategory category)
+            : base(id, depth, category.GetHeaderText())
+        {
+            Category = category;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/MergeCategoryTreeViewItem.cs.meta b/Editor/PlasticSCM/Views/Diff/MergeCategoryTreeViewItem.cs.meta
new file mode 100644
index 0000000..c6a927c
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/MergeCategoryTreeViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 923dacaaac477a941a4a5c7c1657a250
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Diff/UnityDiffTree.cs b/Editor/PlasticSCM/Views/Diff/UnityDiffTree.cs
new file mode 100644
index 0000000..e792ff9
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/UnityDiffTree.cs
@@ -0,0 +1,220 @@
+using System.Collections.Generic;
+
+using Codice.Client.Commands;
+using Codice.Utils;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.Diff;
+
+namespace Unity.PlasticSCM.Editor.Views.Diff
+{
+    internal class UnityDiffTree
+    {
+        internal UnityDiffTree()
+        {
+            mInnerTree = new DiffTree();
+            mMetaCache = new MetaCache();
+        }
+
+        internal void BuildCategories(List<ClientDiff> diffs, bool skipMergeTracking)
+        {
+            mInnerTree.BuildCategories(diffs, skipMergeTracking);
+            mMetaCache.Build(mInnerTree.GetNodes());
+        }
+
+        internal List<IDiffCategory> GetNodes()
+        {
+            return mInnerTree.GetNodes();
+        }
+
+        internal bool HasMeta(ClientDiffInfo difference)
+        {
+            return mMetaCache.ContainsMeta(difference);
+        }
+
+        internal ClientDiffInfo GetMetaDiff(ClientDiffInfo diff)
+        {
+            return mMetaCache.GetExistingMeta(diff);
+        }
+
+        internal void FillWithMeta(List<ClientDiffInfo> diffs)
+        {
+            diffs.AddRange(
+                mMetaCache.GetExistingMeta(diffs));
+        }
+
+        internal void Sort(string key, bool sortAscending)
+        {
+            mInnerTree.Sort(key, sortAscending);
+        }
+
+        internal void Filter(Filter filter, List<string> columnNames)
+        {
+            mInnerTree.Filter(filter, columnNames);
+        }
+
+        MetaCache mMetaCache = new MetaCache();
+        DiffTree mInnerTree;
+
+        class MetaCache
+        {
+            internal void Build(List<IDiffCategory> categories)
+            {
+                mCache.Clear();
+
+                HashSet<string> indexedKeys = BuildIndexedKeys(
+                    GetClientDiffInfos.FromCategories(categories));
+
+                for (int i = 0; i < categories.Count; i++)
+                {
+                    ExtractToMetaCache(
+                        (ITreeViewNode)categories[i],
+                        i,
+                        mCache,
+                        indexedKeys);
+                }
+            }
+
+            internal bool ContainsMeta(ClientDiffInfo diff)
+            {
+                return mCache.ContainsKey(
+                    BuildKey.ForMetaDiff(diff));
+            }
+
+            internal ClientDiffInfo GetExistingMeta(ClientDiffInfo diff)
+            {
+                ClientDiffInfo result;
+
+                if (!mCache.TryGetValue(BuildKey.ForMetaDiff(diff), out result))
+                    return null;
+
+                return result;
+            }
+
+            internal List<ClientDiffInfo> GetExistingMeta(List<ClientDiffInfo> diffs)
+            {
+                List<ClientDiffInfo> result = new List<ClientDiffInfo>();
+
+                foreach (ClientDiffInfo diff in diffs)
+                {
+                    string key = BuildKey.ForMetaDiff(diff);
+
+                    ClientDiffInfo metaDiff;
+                    if (!mCache.TryGetValue(key, out metaDiff))
+                        continue;
+
+                    result.Add(metaDiff);
+                }
+
+                return result;
+            }
+
+            static void ExtractToMetaCache(
+                ITreeViewNode node,
+                int nodeIndex,
+                Dictionary<string, ClientDiffInfo> cache,
+                HashSet<string> indexedKeys)
+            {
+                if (node is ClientDiffInfo)
+                {
+                    ClientDiffInfo diff = (ClientDiffInfo)node;
+
+                    string path = diff.DiffWithMount.Difference.Path;
+
+                    if (!MetaPath.IsMetaPath(path))
+                        return;
+
+                    string realPath = MetaPath.GetPathFromMetaPath(path);
+
+                    if (!indexedKeys.Contains(BuildKey.BuildCacheKey(
+                        BuildKey.GetMergeCategory(diff),
+                        BuildKey.GetChangeCategory(diff),
+                        realPath)))
+                        return;
+
+                    // found foo.c and foo.c.meta
+                    // with the same chage types - move .meta to cache
+                    cache.Add(BuildKey.ForDiff(diff), diff);
+                    ((ChangeCategory)node.GetParent()).RemoveDiffAt(nodeIndex);
+                }
+
+                for (int i = node.GetChildrenCount() - 1; i >= 0; i--)
+                {
+                    ExtractToMetaCache(
+                        node.GetChild(i),
+                        i,
+                        cache,
+                        indexedKeys);
+                }
+            }
+
+            HashSet<string> BuildIndexedKeys(List<ClientDiffInfo> diffs)
+            {
+                HashSet<string> result = new HashSet<string>();
+
+                foreach (ClientDiffInfo diff in diffs)
+                {
+                    if (MetaPath.IsMetaPath(diff.DiffWithMount.Difference.Path))
+                        continue;
+
+                    result.Add(BuildKey.ForDiff(diff));
+                }
+
+                return result;
+            }
+
+            Dictionary<string, ClientDiffInfo> mCache =
+                new Dictionary<string, ClientDiffInfo>();
+
+            static class BuildKey
+            {
+                internal static string ForDiff(
+                    ClientDiffInfo diff)
+                {
+                    return BuildCacheKey(
+                        GetMergeCategory(diff),
+                        GetChangeCategory(diff),
+                        diff.DiffWithMount.Difference.Path);
+                }
+
+                internal static string ForMetaDiff(
+                    ClientDiffInfo diff)
+                {
+                    return BuildCacheKey(
+                        GetMergeCategory(diff),
+                        GetChangeCategory(diff),
+                        MetaPath.GetMetaPath(diff.DiffWithMount.Difference.Path));
+                }
+
+                internal static string BuildCacheKey(
+                    MergeCategory mergeCategory,
+                    ChangeCategory changeCategory,
+                    string path)
+                {
+                    string result = string.Concat(changeCategory.Type, ":", path);
+
+                    if (mergeCategory == null)
+                        return result;
+
+                    return string.Concat(mergeCategory.GetCategoryNameSingular(), ":", result);
+                }
+
+                internal static ChangeCategory GetChangeCategory(ClientDiffInfo diff)
+                {
+                    return (ChangeCategory)diff.GetParent();
+                }
+
+                internal static MergeCategory GetMergeCategory(ClientDiffInfo diff)
+                {
+                    ChangeCategory changeCategory = GetChangeCategory(diff);
+
+                    ITreeViewNode mergeCategory = changeCategory.GetParent();
+
+                    if (mergeCategory == null)
+                        return null;
+
+                    return (MergeCategory)mergeCategory;
+                }
+            }
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Diff/UnityDiffTree.cs.meta b/Editor/PlasticSCM/Views/Diff/UnityDiffTree.cs.meta
new file mode 100644
index 0000000..bf8a30e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Diff/UnityDiffTree.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e89b1e9e9f1060b4f817977507831248
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/FileSystemOperation.cs b/Editor/PlasticSCM/Views/FileSystemOperation.cs
new file mode 100644
index 0000000..ad56fb0
--- /dev/null
+++ b/Editor/PlasticSCM/Views/FileSystemOperation.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor;
+
+using Codice.Client.Common.Threading;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.Items;
+
+namespace Unity.PlasticSCM.Editor.Views
+{
+    internal static class FileSystemOperation
+    {
+        internal static string GetExePath()
+        {
+            string title = PlasticLocalization.GetString(
+                PlasticLocalization.Name.BrowseForExecutableFile);
+
+            string directory = Environment.GetFolderPath(
+                Environment.SpecialFolder.ProgramFiles);
+
+            string path = EditorUtility.OpenFilePanel(title, directory, null);
+
+            if (path.Length != 0)
+                return path;
+
+            return null;
+        }
+
+        internal static void Open(List<string> files)
+        {
+            try
+            {
+                foreach (string file in files)
+                    OpenFile(file);
+            }
+            catch (Exception ex)
+            {
+                ExceptionsHandler.DisplayException(ex);
+            }
+        }
+
+        internal static void OpenInExplorer(string path)
+        {
+            EditorUtility.RevealInFinder(path);
+        }
+
+        static void OpenFile(string path)
+        {
+            if (path == null)
+                return;
+
+            string relativePath = GetRelativePath.ToApplication(path);
+
+            bool result = AssetDatabase.OpenAsset(
+                AssetDatabase.LoadMainAssetAtPath(relativePath));
+
+            if (result)
+                return;
+
+            OpenOperation.OpenFile(path);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/FileSystemOperation.cs.meta b/Editor/PlasticSCM/Views/FileSystemOperation.cs.meta
new file mode 100644
index 0000000..ba2c64b
--- /dev/null
+++ b/Editor/PlasticSCM/Views/FileSystemOperation.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f5eff45d4f0cc5e478e6724c378098eb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/History.meta b/Editor/PlasticSCM/Views/History.meta
new file mode 100644
index 0000000..e109ede
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ac7d3b2f88744a4c89cb263306add7d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/History/HistoryListHeaderState.cs b/Editor/PlasticSCM/Views/History/HistoryListHeaderState.cs
new file mode 100644
index 0000000..bdfd922
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryListHeaderState.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.History
+{
+    internal enum HistoryListColumn
+    {
+        Changeset,
+        CreationDate,
+        CreatedBy,
+        Comment,
+        Branch,
+    }
+
+    [Serializable]
+    internal class HistoryListHeaderState : MultiColumnHeaderState, ISerializationCallbackReceiver
+    {
+        internal static HistoryListHeaderState GetDefault()
+        {
+            return new HistoryListHeaderState(BuildColumns());
+        }
+
+        internal static List<string> GetColumnNames()
+        {
+            List<string> result = new List<string>();
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.ChangesetColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.CreationDateColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.CreatedByColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.CommentColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.BranchColumn));
+            return result;
+        }
+
+        internal static string GetColumnName(HistoryListColumn column)
+        {
+            switch (column)
+            {
+                case HistoryListColumn.Changeset:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.ChangesetColumn);
+                case HistoryListColumn.CreationDate:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.CreationDateColumn);
+                case HistoryListColumn.CreatedBy:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.CreatedByColumn);
+                case HistoryListColumn.Comment:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.CommentColumn);
+                case HistoryListColumn.Branch:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.BranchColumn);
+                default:
+                    return null;
+            }
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            if (mHeaderTitles != null)
+                TreeHeaderColumns.SetTitles(columns, mHeaderTitles);
+
+            if (mColumsAllowedToggleVisibility != null)
+                TreeHeaderColumns.SetVisibilities(columns, mColumsAllowedToggleVisibility);
+        }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+        }
+
+        static Column[] BuildColumns()
+        {
+            return new Column[]
+                {
+                    new Column()
+                    {
+                        width = 100,
+                        headerContent = new GUIContent(
+                            GetColumnName(HistoryListColumn.Changeset)),
+                        minWidth = 50,
+                    },
+                    new Column()
+                    {
+                        width = 250,
+                        headerContent = new GUIContent(
+                            GetColumnName(HistoryListColumn.CreationDate)),
+                        minWidth = 100
+                    },
+                    new Column()
+                    {
+                        width = 250,
+                        headerContent = new GUIContent(
+                            GetColumnName(HistoryListColumn.CreatedBy)),
+                        minWidth = 100
+                    },
+                    new Column()
+                    {
+                        width = 400,
+                        headerContent = new GUIContent(
+                            GetColumnName(HistoryListColumn.Comment)),
+                        minWidth = 100
+                    },
+                    new Column()
+                    {
+                        width = 200,
+                        headerContent = new GUIContent(
+                            GetColumnName(HistoryListColumn.Branch)),
+                        minWidth = 100
+                    },
+                };
+        }
+
+        HistoryListHeaderState(Column[] columns)
+            : base(columns)
+        {
+            if (mHeaderTitles == null)
+                mHeaderTitles = TreeHeaderColumns.GetTitles(columns);
+
+            if (mColumsAllowedToggleVisibility == null)
+                mColumsAllowedToggleVisibility = TreeHeaderColumns.GetVisibilities(columns);
+        }
+
+        [SerializeField]
+        string[] mHeaderTitles;
+
+        [SerializeField]
+        bool[] mColumsAllowedToggleVisibility;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/History/HistoryListHeaderState.cs.meta b/Editor/PlasticSCM/Views/History/HistoryListHeaderState.cs.meta
new file mode 100644
index 0000000..4c9acd5
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryListHeaderState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5b6e8a80709e2264eb383ef6b40e181f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/History/HistoryListView.cs b/Editor/PlasticSCM/Views/History/HistoryListView.cs
new file mode 100644
index 0000000..f1988ac
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryListView.cs
@@ -0,0 +1,381 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.History;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Avatar;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.History
+{
+    internal class HistoryListView : TreeView
+    {
+        internal HistoryListView(
+            string wkPath,
+            RepositorySpec repSpec,
+            HistoryListHeaderState headerState,
+            HistoryListViewMenu menu,
+            List<string> columnNames) :
+            base(new TreeViewState())
+        {
+            mWkPath = wkPath;
+            mRepSpec = repSpec;
+            mMenu = menu;
+            mColumnNames = columnNames;
+
+            multiColumnHeader = new MultiColumnHeader(headerState);
+            multiColumnHeader.canSort = true;
+            multiColumnHeader.sortingChanged += SortingChanged;
+
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+
+            mCooldownFilterAction = new CooldownWindowDelayer(
+                DelayedSearchChanged, UnityConstants.SEARCH_DELAYED_INPUT_ACTION_INTERVAL);
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        public override void OnGUI(Rect rect)
+        {
+            base.OnGUI(rect);
+
+            Event e = Event.current;
+
+            if (e.type != EventType.KeyDown)
+                return;
+
+            bool isProcessed = mMenu.ProcessKeyActionIfNeeded(e);
+
+            if (isProcessed)
+                e.Use();
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(
+            TreeViewItem rootItem)
+        {
+            if (mRevisionsList == null)
+            {
+                ClearRows(rootItem, mRows);
+
+                return mRows;
+            }
+
+            RegenerateRows(
+                mListViewItemIds,
+                mRevisionsList,
+                rootItem,
+                mRows);
+
+            return mRows;
+        }
+
+        protected override void SearchChanged(string newSearch)
+        {
+            mCooldownFilterAction.Ping();
+        }
+
+        protected override void ContextClickedItem(int id)
+        {
+            mMenu.Popup();
+            Repaint();
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            if (args.item is HistoryListViewItem)
+            {
+                HistoryListViewItem historyListViewItem = (HistoryListViewItem)args.item;
+
+                HistoryListViewItemGUI(
+                    mWkPath,
+                    mRepSpec,
+                    rowHeight,
+                    historyListViewItem,
+                    args,
+                    mLoadedRevisionId == historyListViewItem.Revision.Id,
+                    Repaint);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        internal void BuildModel(
+            HistoryRevisionList historyRevisionList,
+            long loadedRevisionId)
+        {
+            mListViewItemIds.Clear();
+
+            mRevisionsList = historyRevisionList;
+            mLoadedRevisionId = loadedRevisionId;
+        }
+
+        internal void Refilter()
+        {
+            if (mRevisionsList == null)
+                return;
+
+            Filter filter = new Filter(searchString);
+            mRevisionsList.Filter(filter, mColumnNames);
+        }
+
+        internal void Sort()
+        {
+            if (mRevisionsList == null)
+                return;
+
+            int sortedColumnIdx = multiColumnHeader.state.sortedColumnIndex;
+            bool sortAscending = multiColumnHeader.IsSortedAscending(sortedColumnIdx);
+
+            mRevisionsList.Sort(
+                mColumnNames[sortedColumnIdx],
+                sortAscending);
+        }
+
+        internal long GetLoadedRevisionId()
+        {
+            return mLoadedRevisionId;
+        }
+
+        internal List<RepObjectInfo> GetSelectedRepObjectInfos()
+        {
+            List<RepObjectInfo> result = new List<RepObjectInfo>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<RepObjectInfo, int> item
+                in mListViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                result.Add(item.Key);
+            }
+
+            return result;
+        }
+
+        internal List<HistoryRevision> GetSelectedHistoryRevisions()
+        {
+            return GetSelectedRepObjectInfos().OfType<HistoryRevision>().ToList();
+        }
+
+        internal void SelectRepObjectInfos(
+            List<RepObjectInfo> repObjectsToSelect)
+        {
+            List<int> idsToSelect = new List<int>();
+
+            foreach (RepObjectInfo repObjectInfo in repObjectsToSelect)
+            {
+                int repObjectInfoId = GetTreeIdForItem(repObjectInfo);
+
+                if (repObjectInfoId == -1)
+                    continue;
+
+                idsToSelect.Add(repObjectInfoId);
+            }
+
+            TableViewOperations.SetSelectionAndScroll(this, idsToSelect);
+        }
+
+        int GetTreeIdForItem(RepObjectInfo currentRepObjectInfo)
+        {
+            foreach (KeyValuePair<RepObjectInfo, int> item in mListViewItemIds.GetInfoItems())
+            {
+                if (!currentRepObjectInfo.Equals(item.Key))
+                    continue;
+
+                if (!currentRepObjectInfo.GUID.Equals(item.Key.GUID))
+                    continue;
+
+                return item.Value;
+            }
+
+            return -1;
+        }
+
+        void DelayedSearchChanged()
+        {
+            Refilter();
+
+            Sort();
+
+            Reload();
+
+            TableViewOperations.ScrollToSelection(this);
+        }
+
+        void SortingChanged(MultiColumnHeader multiColumnHeader)
+        {
+            Sort();
+
+            Reload();
+        }
+
+        static void RegenerateRows(
+            ListViewItemIds<RepObjectInfo> listViewItemIds,
+            HistoryRevisionList revisions,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            ClearRows(rootItem, rows);
+
+            if (revisions.GetCount() == 0)
+                return;
+
+            foreach (RepObjectInfo objectInfo in revisions.GetRevisions())
+            {
+                int objectId;
+                if (!listViewItemIds.TryGetInfoItemId(objectInfo, out objectId))
+                    objectId = listViewItemIds.AddInfoItem(objectInfo);
+
+                HistoryListViewItem changesetListViewItem =
+                    new HistoryListViewItem(objectId, objectInfo);
+
+                rootItem.AddChild(changesetListViewItem);
+                rows.Add(changesetListViewItem);
+            }
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static void HistoryListViewItemGUI(
+            string wkPath,
+            RepositorySpec repSpec,
+            float rowHeight,
+            HistoryListViewItem item,
+            RowGUIArgs args,
+            bool isBoldText,
+            Action avatarLoadedAction)
+        {
+            for (int visibleColumnIdx = 0; visibleColumnIdx < args.GetNumVisibleColumns(); visibleColumnIdx++)
+            {
+                Rect cellRect = args.GetCellRect(visibleColumnIdx);
+
+                HistoryListColumn column =
+                    (HistoryListColumn)args.GetColumn(visibleColumnIdx);
+
+                HistoryListViewItemCellGUI(
+                    cellRect,
+                    rowHeight,
+                    wkPath,
+                    repSpec,
+                    item,
+                    column,
+                    avatarLoadedAction,
+                    args.selected,
+                    args.focused,
+                    isBoldText);
+            }
+        }
+
+        static void HistoryListViewItemCellGUI(
+            Rect rect,
+            float rowHeight,
+            string wkPath,
+            RepositorySpec repSpec,
+            HistoryListViewItem item,
+            HistoryListColumn column,
+            Action avatarLoadedAction,
+            bool isSelected,
+            bool isFocused,
+            bool isBoldText)
+        {
+            string columnText = HistoryInfoView.GetColumnText(
+                wkPath, repSpec, item.Revision,
+                HistoryListHeaderState.GetColumnName(column));
+
+            if (column == HistoryListColumn.Changeset)
+            {
+                DrawTreeViewItem.ForItemCell(
+                    rect,
+                    rowHeight,
+                    0,
+                    GetRevisionIcon(item.Revision),
+                    null,
+                    columnText,
+                    isSelected,
+                    isFocused,
+                    isBoldText,
+                    false);
+
+                return;
+            }
+
+            if (column == HistoryListColumn.CreatedBy)
+            {
+                DrawTreeViewItem.ForItemCell(
+                    rect,
+                    rowHeight,
+                    -1,
+                    GetAvatar.ForEmail(columnText, avatarLoadedAction),
+                    null,
+                    columnText,
+                    isSelected,
+                    isFocused,
+                    isBoldText,
+                    false);
+                return;
+            }
+
+            if (column == HistoryListColumn.Branch)
+            {
+                DrawTreeViewItem.ForSecondaryLabel(
+                    rect, columnText, isSelected, isFocused, isBoldText);
+                return;
+            }
+
+            DrawTreeViewItem.ForLabel(
+                rect, columnText, isSelected, isFocused, isBoldText);
+        }
+
+        static Texture GetRevisionIcon(RepObjectInfo revision)
+        {
+            if (revision is MoveRealizationInfo)
+                return Images.GetImage(Images.Name.IconMoved);
+
+            if (revision is RemovedRealizationInfo)
+                return Images.GetImage(Images.Name.IconDeleted);
+
+            return Images.GetFileIcon();
+        }
+
+        ListViewItemIds<RepObjectInfo> mListViewItemIds = new ListViewItemIds<RepObjectInfo>();
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        HistoryRevisionList mRevisionsList;
+        long mLoadedRevisionId;
+
+        readonly CooldownWindowDelayer mCooldownFilterAction;
+        readonly HistoryListViewMenu mMenu;
+        readonly List<string> mColumnNames;
+        readonly RepositorySpec mRepSpec;
+        readonly string mWkPath;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/History/HistoryListView.cs.meta b/Editor/PlasticSCM/Views/History/HistoryListView.cs.meta
new file mode 100644
index 0000000..ca83eda
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryListView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0ee2845d0d4db9a4a9e8f4f6d0fa4e5e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/History/HistoryListViewItem.cs b/Editor/PlasticSCM/Views/History/HistoryListViewItem.cs
new file mode 100644
index 0000000..0c6eb9a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryListViewItem.cs
@@ -0,0 +1,20 @@
+
+using UnityEditor.IMGUI.Controls;
+
+using Codice.CM.Common;
+
+namespace Unity.PlasticSCM.Editor.Views.History
+{
+    internal class HistoryListViewItem : TreeViewItem
+    {
+        internal RepObjectInfo Revision { get; private set; }
+
+        internal HistoryListViewItem(int id, RepObjectInfo revision)
+            : base(id, 1)
+        {
+            Revision = revision;
+
+            displayName = id.ToString();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/History/HistoryListViewItem.cs.meta b/Editor/PlasticSCM/Views/History/HistoryListViewItem.cs.meta
new file mode 100644
index 0000000..f4d44ea
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryListViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b1b8657301e8ead4a9389eda02c15883
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/History/HistoryListViewMenu.cs b/Editor/PlasticSCM/Views/History/HistoryListViewMenu.cs
new file mode 100644
index 0000000..1b1f072
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryListViewMenu.cs
@@ -0,0 +1,216 @@
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.History;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.History
+{
+    internal class HistoryListViewMenu
+    {
+        internal interface IMenuOperations
+        {
+            long GetSelectedChangesetId();
+        }
+
+        internal HistoryListViewMenu(
+            IHistoryViewMenuOperations operations,
+            IMenuOperations menuOperations)
+        {
+            mOperations = operations;
+            mMenuOperations = menuOperations;
+
+            BuildComponents();
+        }
+
+        internal void Popup()
+        {
+            GenericMenu menu = new GenericMenu();
+
+            UpdateMenuItems(menu);
+
+            menu.ShowAsContext();
+        }
+
+        internal bool ProcessKeyActionIfNeeded(Event e)
+        {
+            HistoryMenuOperations operationToExecute = GetMenuOperation(e);
+
+            if (operationToExecute == HistoryMenuOperations.None)
+                return false;
+
+            SelectedHistoryGroupInfo info =
+                mOperations.GetSelectedHistoryGroupInfo();
+
+            HistoryMenuOperations operations =
+                HistoryMenuUpdater.GetAvailableMenuOperations(info);
+
+            if (!operations.HasFlag(operationToExecute))
+                return false;
+
+            ProcessMenuOperation(operationToExecute, mOperations);
+            return true;
+        }
+
+        void OpenRevisionMenu_Click()
+        {
+            mOperations.OpenRevision();
+        }
+
+        void OpenRevisionWithMenu_Click()
+        {
+            mOperations.OpenRevisionWith();
+        }
+
+        void SaveRevisionasMenu_Click()
+        {
+            mOperations.SaveRevisionAs();
+        }
+
+        void DiffWithPreviousMenuItem_Click()
+        {
+            mOperations.DiffWithPrevious();
+        }
+
+        void DiffSelectedRevisionsMenu_Click()
+        {
+            mOperations.DiffSelectedRevisions();
+        }
+
+        void DiffChangesetMenu_Click()
+        {
+            mOperations.DiffChangeset();
+        }
+        void RevertToThisRevisionMenu_Click()
+        {
+            mOperations.RevertToThisRevision();
+        }
+
+        void UpdateMenuItems(GenericMenu menu)
+        {
+            SelectedHistoryGroupInfo info =
+                mOperations.GetSelectedHistoryGroupInfo();
+
+            HistoryMenuOperations operations =
+                HistoryMenuUpdater.GetAvailableMenuOperations(info);
+
+            if (operations == HistoryMenuOperations.None)
+            {
+                menu.AddDisabledItem(GetNoActionMenuItemContent(), false);
+                return;
+            }
+
+            if (operations.HasFlag(HistoryMenuOperations.Open))
+                menu.AddItem(mOpenRevisionMenuItemContent, false, OpenRevisionMenu_Click);
+            else
+                menu.AddDisabledItem(mOpenRevisionMenuItemContent, false);
+
+            if (operations.HasFlag(HistoryMenuOperations.OpenWith))
+                menu.AddItem(mOpenRevisionWithMenuItemContent, false, OpenRevisionWithMenu_Click);
+            else
+                menu.AddDisabledItem(mOpenRevisionWithMenuItemContent, false);
+
+            if (operations.HasFlag(HistoryMenuOperations.SaveAs))
+                menu.AddItem(mSaveRevisionAsMenuItemContent, false, SaveRevisionasMenu_Click);
+            else
+                menu.AddDisabledItem(mSaveRevisionAsMenuItemContent, false);
+
+            menu.AddSeparator(string.Empty);
+
+            if (operations.HasFlag(HistoryMenuOperations.DiffWithPrevious))
+                menu.AddItem(mDiffWithPreviousMenuItemContent, false, DiffWithPreviousMenuItem_Click);
+
+            if (operations.HasFlag(HistoryMenuOperations.DiffSelected))
+                menu.AddItem(mDiffSelectedRevisionsMenuItemContent, false, DiffSelectedRevisionsMenu_Click);
+
+            mDiffChangesetMenuItemContent.text =
+                PlasticLocalization.GetString(PlasticLocalization.Name.HistoryMenuItemDiffChangeset) +
+                string.Format(" {0}", GetSelectedChangesetName(mMenuOperations));
+
+            if (operations.HasFlag(HistoryMenuOperations.DiffChangeset))
+                menu.AddItem(mDiffChangesetMenuItemContent, false, DiffChangesetMenu_Click);
+            else
+                menu.AddDisabledItem(mDiffChangesetMenuItemContent, false);
+
+            menu.AddSeparator(string.Empty);
+
+            if (operations.HasFlag(HistoryMenuOperations.RevertTo))
+                menu.AddItem(mRevertToThisRevisionMenuItemContent, false, RevertToThisRevisionMenu_Click);
+            else
+                menu.AddDisabledItem(mRevertToThisRevisionMenuItemContent, false);
+        }
+
+        static HistoryMenuOperations GetMenuOperation(Event e)
+        {
+            if (Keyboard.IsControlOrCommandKeyPressed(e) && Keyboard.IsKeyPressed(e, KeyCode.D))
+                return HistoryMenuOperations.DiffWithPrevious;
+
+            return HistoryMenuOperations.None;
+        }
+
+        static void ProcessMenuOperation(
+            HistoryMenuOperations operationToExecute,
+            IHistoryViewMenuOperations operations)
+        {
+            if (operationToExecute == HistoryMenuOperations.DiffWithPrevious)
+            {
+                operations.DiffWithPrevious();
+                return;
+            }
+        }
+
+        GUIContent GetNoActionMenuItemContent()
+        {
+            if (mNoActionMenuItemContent == null)
+            {
+                mNoActionMenuItemContent = new GUIContent(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.NoActionMenuItem));
+            }
+
+            return mNoActionMenuItemContent;
+        }
+
+        static string GetSelectedChangesetName(IMenuOperations menuOperations)
+        {
+            long selectedChangesetId = menuOperations.GetSelectedChangesetId();
+
+            if (selectedChangesetId == -1)
+                return string.Empty;
+
+            return selectedChangesetId.ToString();
+        }
+
+        void BuildComponents()
+        {
+            mOpenRevisionMenuItemContent = new GUIContent(PlasticLocalization.
+                GetString(PlasticLocalization.Name.HistoryMenuItemOpen));
+            mOpenRevisionWithMenuItemContent = new GUIContent(PlasticLocalization.
+                GetString(PlasticLocalization.Name.HistoryMenuItemOpenWith));
+            mSaveRevisionAsMenuItemContent = new GUIContent(PlasticLocalization.
+                GetString(PlasticLocalization.Name.SaveThisRevisionAs));
+            mDiffWithPreviousMenuItemContent = new GUIContent(string.Format("{0} {1}",
+                PlasticLocalization.GetString(PlasticLocalization.Name.HistoryMenuItemDiffWithPrevious),
+                GetPlasticShortcut.ForDiff()));
+            mDiffSelectedRevisionsMenuItemContent = new GUIContent(PlasticLocalization.
+                GetString(PlasticLocalization.Name.HistoryMenuItemDiffSelectedRevisions));
+            mDiffChangesetMenuItemContent = new GUIContent();
+            mRevertToThisRevisionMenuItemContent = new GUIContent(PlasticLocalization.
+                GetString(PlasticLocalization.Name.HistoryMenuItemRevertToThisRevision));
+        }
+
+        GUIContent mNoActionMenuItemContent;
+
+        GUIContent mOpenRevisionMenuItemContent;
+        GUIContent mOpenRevisionWithMenuItemContent;
+        GUIContent mSaveRevisionAsMenuItemContent;
+        GUIContent mDiffWithPreviousMenuItemContent;
+        GUIContent mDiffSelectedRevisionsMenuItemContent;
+        GUIContent mDiffChangesetMenuItemContent;
+        GUIContent mRevertToThisRevisionMenuItemContent;
+
+        readonly IHistoryViewMenuOperations mOperations;
+        readonly IMenuOperations mMenuOperations;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/History/HistoryListViewMenu.cs.meta b/Editor/PlasticSCM/Views/History/HistoryListViewMenu.cs.meta
new file mode 100644
index 0000000..cc5aa23
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryListViewMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c3cec769cd6ff2849aa09c811b62e611
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/History/HistorySelection.cs b/Editor/PlasticSCM/Views/History/HistorySelection.cs
new file mode 100644
index 0000000..90bce6e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistorySelection.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+
+using Codice.CM.Common;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.History
+{
+    internal static class HistorySelection
+    {
+        internal static void SelectRevisions(
+            HistoryListView listView,
+            List<RepObjectInfo> revisionsToSelect)
+        {
+            if (revisionsToSelect == null || revisionsToSelect.Count == 0)
+            {
+                TableViewOperations.SelectFirstRow(listView);
+                return;
+            }
+
+            listView.SelectRepObjectInfos(revisionsToSelect);
+
+            if (listView.HasSelection())
+                return;
+
+            TableViewOperations.SelectFirstRow(listView);
+        }
+
+        internal static List<RepObjectInfo> GetSelectedRepObjectInfos(
+            HistoryListView listView)
+        {
+            return listView.GetSelectedRepObjectInfos();
+        }
+
+        internal static List<HistoryRevision> GetSelectedHistoryRevisions(
+            HistoryListView listView)
+        {
+            return listView.GetSelectedHistoryRevisions();
+        }
+
+        internal static HistoryRevision GetSelectedHistoryRevision(
+            HistoryListView listView)
+        {
+            List<HistoryRevision> revisions =
+                listView.GetSelectedHistoryRevisions();
+
+            if (revisions.Count == 0)
+                return null;
+
+            return revisions[0];
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/History/HistorySelection.cs.meta b/Editor/PlasticSCM/Views/History/HistorySelection.cs.meta
new file mode 100644
index 0000000..b600ed3
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistorySelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9553f392d0be2a24daf3cad457d2c612
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/History/HistoryTab.cs b/Editor/PlasticSCM/Views/History/HistoryTab.cs
new file mode 100644
index 0000000..5a0eabc
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryTab.cs
@@ -0,0 +1,400 @@
+using System.Collections.Generic;
+using System.IO;
+
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.CM.Common;
+using Codice.Client.Common;
+
+using GluonGui;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow;
+using PlasticGui.WorkspaceWindow.Diff;
+using PlasticGui.WorkspaceWindow.History;
+
+using GluonRevertOperation = GluonGui.WorkspaceWindow.Views.Details.History.RevertOperation;
+using HistoryDescriptor = GluonGui.WorkspaceWindow.Views.Details.History.HistoryDescriptor;
+
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.UI.Tree;
+using Unity.PlasticSCM.Editor.Views.Changesets;
+
+namespace Unity.PlasticSCM.Editor.Views.History
+{
+    internal class HistoryTab :
+        IRefreshableView,
+        HistoryViewLogic.IHistoryView,
+        HistoryListViewMenu.IMenuOperations,
+        IHistoryViewMenuOperations
+    {
+        internal HistoryTab(
+            WorkspaceInfo wkInfo,
+            IWorkspaceWindow workspaceWindow,
+            RepositorySpec repSpec,
+            NewIncomingChangesUpdater newIncomingChangesUpdater,
+            ViewHost viewHost,
+            EditorWindow parentWindow,
+            bool isGluonMode)
+        {
+            mWkInfo = wkInfo;
+            mWorkspaceWindow = workspaceWindow;
+            mRepSpec = repSpec;
+            mNewIncomingChangesUpdater = newIncomingChangesUpdater;
+            mViewHost = viewHost;
+            mParentWindow = parentWindow;
+            mIsGluonMode = isGluonMode;
+
+            mGuiMessage = new UnityPlasticGuiMessage(parentWindow);
+
+            BuildComponents(wkInfo, repSpec);
+
+            mProgressControls = new ProgressControlsForViews();
+
+            mHistoryViewLogic = new HistoryViewLogic(
+                wkInfo, this, mProgressControls);
+        }
+
+        internal void RefreshForItem(
+            long itemId,
+            string path,
+            bool isDirectory)
+        {
+            mItemId = itemId;
+            mPath = path;
+            mIsDirectory = isDirectory;
+
+            ((IRefreshableView)this).Refresh();
+        }
+
+        internal void Update()
+        {
+            mProgressControls.UpdateProgress(mParentWindow);
+        }
+
+        internal void OnGUI()
+        {
+            DoActionsToolbar(
+                this,
+                mProgressControls,
+                mSearchField,
+                mHistoryListView,
+                GetViewTitle(mPath));
+
+            DoHistoryArea(
+                mHistoryListView,
+                mProgressControls.IsOperationRunning());
+        }
+
+        internal void OnDisable()
+        {
+            mSearchField.downOrUpArrowKeyPressed -=
+                SearchField_OnDownOrUpArrowKeyPressed;
+
+            TreeHeaderSettings.Save(
+                mHistoryListView.multiColumnHeader.state,
+                UnityConstants.HISTORY_TABLE_SETTINGS_NAME);
+        }
+
+        void IRefreshableView.Refresh()
+        {
+            mHistoryViewLogic.RefreshForItem(mRepSpec, mItemId);
+        }
+
+        List<RepObjectInfo> HistoryViewLogic.IHistoryView.GetSelectedRevisions()
+        {
+            return HistorySelection.GetSelectedRepObjectInfos(mHistoryListView);
+        }
+
+        void HistoryViewLogic.IHistoryView.SelectRevisions(
+            List<RepObjectInfo> revisionsToSelect)
+        {
+            HistorySelection.SelectRevisions(
+                mHistoryListView, revisionsToSelect);
+        }
+
+        void HistoryViewLogic.IHistoryView.UpdateData(
+            HistoryRevisionList list, long loadedRevisionId)
+        {
+            mHistoryListView.BuildModel(list, loadedRevisionId);
+
+            mHistoryListView.Refilter();
+
+            mHistoryListView.Sort();
+
+            mHistoryListView.Reload();
+        }
+
+        long HistoryListViewMenu.IMenuOperations.GetSelectedChangesetId()
+        {
+            HistoryRevision revision = HistorySelection.
+                GetSelectedHistoryRevision(mHistoryListView);
+
+            if (revision == null)
+                return -1;
+
+            return revision.ChangeSet;
+        }
+
+        SelectedHistoryGroupInfo IHistoryViewMenuOperations.GetSelectedHistoryGroupInfo()
+        {
+            return SelectedHistoryGroupInfo.BuildFromSelection(
+                HistorySelection.GetSelectedRepObjectInfos(mHistoryListView),
+                HistorySelection.GetSelectedHistoryRevisions(mHistoryListView),
+                mHistoryListView.GetLoadedRevisionId(),
+                mIsDirectory);
+        }
+
+        void IHistoryViewMenuOperations.OpenRevision()
+        {
+            OpenRevisionOperation.Open(
+                mRepSpec,
+                Path.GetFileName(mPath),
+                HistorySelection.GetSelectedHistoryRevisions(
+                    mHistoryListView));
+        }
+
+        void IHistoryViewMenuOperations.OpenRevisionWith()
+        {
+            List<HistoryRevision> revisions = HistorySelection.
+                GetSelectedHistoryRevisions(mHistoryListView);
+
+            OpenRevisionOperation.OpenWith(
+                mRepSpec,
+                FileSystemOperation.GetExePath(),
+                Path.GetFileName(mPath),
+                revisions);
+        }
+
+        void IHistoryViewMenuOperations.SaveRevisionAs()
+        {
+            HistoryRevision revision = HistorySelection.
+                GetSelectedHistoryRevision(mHistoryListView);
+
+            string defaultFileName = DefaultRevisionName.Get(
+                Path.GetFileName(mPath), revision.ChangeSet);
+
+            string destinationPath = SaveAction.GetDestinationPath(
+                mWkInfo.ClientPath, mPath, defaultFileName);
+
+            if (string.IsNullOrEmpty(destinationPath))
+                return;
+
+            SaveRevisionOperation.SaveRevision(
+                mRepSpec,
+                destinationPath,
+                revision,
+                mProgressControls);
+        }
+
+        void IHistoryViewMenuOperations.DiffWithPrevious()
+        {
+            HistoryRevision revision = HistorySelection.
+                GetSelectedHistoryRevision(mHistoryListView);
+
+            DiffOperation.DiffWithPrevious(
+                mWkInfo,
+                mRepSpec,
+                Path.GetFileName(mPath),
+                string.Empty,
+                revision.Id,
+                mItemId,
+                revision.ChangeSet,
+                mProgressControls,
+                null,
+                null);
+        }
+
+        void IHistoryViewMenuOperations.DiffSelectedRevisions()
+        {
+            List<HistoryRevision> revisions = HistorySelection.
+                GetSelectedHistoryRevisions(mHistoryListView);
+
+            bool areReversed = revisions[0].Id > revisions[1].Id;
+
+            DiffOperation.DiffRevisions(
+                mWkInfo,
+                mRepSpec,
+                Path.GetFileName(mPath),
+                string.Empty,
+                mItemId,
+                revisions[(areReversed) ? 1 : 0],
+                revisions[(areReversed) ? 0 : 1],
+                mProgressControls,
+                null,
+                null);
+        }
+
+        void IHistoryViewMenuOperations.DiffChangeset()
+        {
+            HistoryRevision revision = HistorySelection.
+                GetSelectedHistoryRevision(mHistoryListView);
+
+            LaunchDiffOperations.DiffChangeset(
+                mRepSpec, revision.ChangeSet, mIsGluonMode);
+        }
+
+        void IHistoryViewMenuOperations.RevertToThisRevision()
+        {
+            HistoryRevision revision = HistorySelection.
+                GetSelectedHistoryRevision(mHistoryListView);
+
+            string fullPath = GetFullPath(mWkInfo.ClientPath, mPath);
+
+            if (mIsGluonMode)
+            {
+                HistoryDescriptor historyDescriptor = new HistoryDescriptor(
+                    mRepSpec, fullPath, mItemId, revision.Id, mIsDirectory);
+
+                GluonRevertOperation.RevertToThisRevision(
+                    mWkInfo,
+                    mViewHost,
+                    mProgressControls,
+                    historyDescriptor,
+                    revision,
+                    mGuiMessage,
+                    RefreshAsset.UnityAssetDatabase);
+                return;
+            }
+
+            RevertOperation.RevertToThisRevision(
+                mWkInfo,
+                mProgressControls,
+                mWorkspaceWindow,
+                mRepSpec,
+                revision,
+                fullPath,
+                mGuiMessage,
+                mNewIncomingChangesUpdater,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        void SearchField_OnDownOrUpArrowKeyPressed()
+        {
+            mHistoryListView.SetFocusAndEnsureSelectedItem();
+        }
+
+        static string GetFullPath(string wkPath, string path)
+        {
+            if (PathHelper.IsContainedOn(path, wkPath))
+                return path;
+
+            return WorkspacePath.GetWorkspacePathFromCmPath(
+                wkPath, path, Path.DirectorySeparatorChar);
+        }
+
+        static void DoActionsToolbar(
+            IRefreshableView refreshableView,
+            ProgressControlsForViews progressControls,
+            SearchField searchField,
+            HistoryListView listView,
+            string viewTitle)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            GUILayout.Label(
+                viewTitle,
+                UnityStyles.HistoryTab.HeaderLabel);
+
+            if (progressControls.IsOperationRunning())
+            {
+                DrawProgressForViews.ForIndeterminateProgress(
+                    progressControls.ProgressData);
+            }
+
+            GUILayout.FlexibleSpace();
+
+            DrawSearchField.For(
+                searchField,
+                listView,
+                UnityConstants.SEARCH_FIELD_WIDTH);
+
+            DoRefreshButton(
+                refreshableView,
+                progressControls.IsOperationRunning());
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoRefreshButton(
+            IRefreshableView refreshableView,
+            bool isOperationRunning)
+        {
+            EditorGUI.BeginDisabledGroup(isOperationRunning);
+
+            if (GUILayout.Button(new GUIContent(
+                    Images.GetRefreshIcon()), EditorStyles.toolbarButton))
+                refreshableView.Refresh();
+
+            EditorGUI.EndDisabledGroup();
+        }
+
+        static void DoHistoryArea(
+            HistoryListView historyListView,
+            bool isOperationRunning)
+        {
+            GUI.enabled = !isOperationRunning;
+
+            Rect rect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            historyListView.OnGUI(rect);
+
+            GUI.enabled = true;
+        }
+
+        static string GetViewTitle(string path)
+        {
+            path = PathHelper.RemoveLastSlash(
+                path, Path.DirectorySeparatorChar);
+
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.HistoryViewTitle,
+                Path.GetFileName(path));
+        }
+
+        void BuildComponents(
+            WorkspaceInfo wkInfo,
+            RepositorySpec repSpec)
+        {
+            mSearchField = new SearchField();
+            mSearchField.downOrUpArrowKeyPressed += SearchField_OnDownOrUpArrowKeyPressed;
+
+            HistoryListHeaderState headerState =
+                HistoryListHeaderState.GetDefault();
+            TreeHeaderSettings.Load(headerState,
+                UnityConstants.HISTORY_TABLE_SETTINGS_NAME,
+                (int)HistoryListColumn.CreationDate,
+                false);
+
+            mHistoryListView = new HistoryListView(
+                wkInfo.ClientPath,
+                repSpec,
+                headerState,
+                new HistoryListViewMenu(this, this),
+                HistoryListHeaderState.GetColumnNames());
+
+            mHistoryListView.Reload();
+        }
+
+        SearchField mSearchField;
+        HistoryListView mHistoryListView;
+
+        long mItemId;
+        string mPath;
+        bool mIsDirectory;
+
+        readonly WorkspaceInfo mWkInfo;
+        readonly HistoryViewLogic mHistoryViewLogic;
+        readonly ProgressControlsForViews mProgressControls;
+        readonly IWorkspaceWindow mWorkspaceWindow;
+        readonly RepositorySpec mRepSpec;
+        readonly bool mIsGluonMode;
+        readonly EditorWindow mParentWindow;
+        readonly ViewHost mViewHost;
+        readonly GuiMessage.IGuiMessage mGuiMessage;
+        readonly NewIncomingChangesUpdater mNewIncomingChangesUpdater;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/History/HistoryTab.cs.meta b/Editor/PlasticSCM/Views/History/HistoryTab.cs.meta
new file mode 100644
index 0000000..a1a4d30
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/HistoryTab.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3a49359b59c12b74386ca6816923ec2c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/History/SaveAction.cs b/Editor/PlasticSCM/Views/History/SaveAction.cs
new file mode 100644
index 0000000..ff3e08a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/SaveAction.cs
@@ -0,0 +1,38 @@
+using System.IO;
+
+using UnityEditor;
+
+using Codice.Client.Common;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.Views.History
+{
+    internal static class SaveAction
+    {
+        internal static string GetDestinationPath(
+            string wkPath,
+            string path,
+            string defaultFileName)
+        {
+            string title = PlasticLocalization.GetString(
+                PlasticLocalization.Name.SaveRevisionAs);
+
+            string parentDirectory = GetDirectoryForSaveAs(wkPath, path);
+
+            return EditorUtility.SaveFilePanel(
+                title, parentDirectory, defaultFileName,
+                string.Empty);
+        }
+
+        static string GetDirectoryForSaveAs(string wkPath, string path)
+        {
+            if (PathHelper.IsContainedOn(path, wkPath))
+                return Path.GetDirectoryName(path);
+
+            return WorkspacePath.GetWorkspacePathFromCmPath(
+                wkPath,
+                Path.GetDirectoryName(path),
+                Path.DirectorySeparatorChar);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/History/SaveAction.cs.meta b/Editor/PlasticSCM/Views/History/SaveAction.cs.meta
new file mode 100644
index 0000000..5fd975d
--- /dev/null
+++ b/Editor/PlasticSCM/Views/History/SaveAction.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 025a530ab434a7e40ad318955f571e50
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges.meta b/Editor/PlasticSCM/Views/IncomingChanges.meta
new file mode 100644
index 0000000..a7897b6
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0ecc4e2fc6e40a54fb97cab710a1dd41
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer.meta
new file mode 100644
index 0000000..0346e33
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 97b1b110b0cf5ec428f9553e02bb7c03
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeCategoryTreeViewItem.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeCategoryTreeViewItem.cs
new file mode 100644
index 0000000..2b46097
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeCategoryTreeViewItem.cs
@@ -0,0 +1,17 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    internal class ChangeCategoryTreeViewItem : TreeViewItem
+    {
+        internal IncomingChangesCategory Category { get; private set; }
+
+        internal ChangeCategoryTreeViewItem(int id, IncomingChangesCategory category)
+            : base(id, 0, category.CategoryType.ToString())
+        {
+            Category = category;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeCategoryTreeViewItem.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeCategoryTreeViewItem.cs.meta
new file mode 100644
index 0000000..6f8d19c
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeCategoryTreeViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c408e05e88bc93c458a3195b15e9d625
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeTreeViewItem.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeTreeViewItem.cs
new file mode 100644
index 0000000..543001b
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeTreeViewItem.cs
@@ -0,0 +1,19 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    internal class ChangeTreeViewItem : TreeViewItem
+    {
+        internal IncomingChangeInfo ChangeInfo { get; private set; }
+
+        internal ChangeTreeViewItem(int id, IncomingChangeInfo change)
+            : base(id, 1)
+        {
+            ChangeInfo = change;
+
+            displayName = id.ToString();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeTreeViewItem.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeTreeViewItem.cs.meta
new file mode 100644
index 0000000..d621202
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/ChangeTreeViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 69ebbdad2c303214683305d65fe26726
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/DirectoryConflicts.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/DirectoryConflicts.meta
new file mode 100644
index 0000000..9980dba
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/DirectoryConflicts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5b3802c1581ef894d83aa9fcb7ace84c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesSelection.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesSelection.cs
new file mode 100644
index 0000000..22624e8
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesSelection.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    internal static class IncomingChangesSelection
+    {
+        internal static List<string> GetPathsFromSelectedFileConflictsIncludingMeta(
+            IncomingChangesTreeView treeView)
+        {
+            List<string> result = new List<string>();
+
+            List<IncomingChangeInfo> selection =
+                treeView.GetSelectedFileConflicts();
+
+            treeView.FillWithMeta(selection);
+
+            foreach (IncomingChangeInfo incomingChange in selection)
+            {
+                result.Add(incomingChange.GetPath());
+            }
+
+            return result;
+        }
+
+        internal static SelectedIncomingChangesGroupInfo GetSelectedGroupInfo(
+            IncomingChangesTreeView treeView)
+        {
+            List<IncomingChangeInfo> selectedIncomingChanges =
+                treeView.GetSelectedIncomingChanges();
+
+            return GetSelectedIncomingChangesGroupInfo.For(
+                selectedIncomingChanges);
+        }
+
+        internal static IncomingChangeInfo GetSingleSelectedIncomingChange(
+            IncomingChangesTreeView treeView)
+        {
+            return treeView.GetSelectedIncomingChange();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesSelection.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesSelection.cs.meta
new file mode 100644
index 0000000..95767ca
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesSelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b10c9294742ed4040ad32d0b73b16c75
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTab.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTab.cs
new file mode 100644
index 0000000..01c7373
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTab.cs
@@ -0,0 +1,881 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.BaseCommands.Merge;
+using Codice.Client.Commands;
+using Codice.Client.Common;
+using Codice.Client.Common.FsNodeReaders;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow;
+using PlasticGui.WorkspaceWindow.BranchExplorer;
+using PlasticGui.WorkspaceWindow.Diff;
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+using PlasticGui.WorkspaceWindow.Merge;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.UI.Tree;
+using Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer.DirectoryConflicts;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    internal class IncomingChangesTab :
+        IIncomingChangesTab,
+        IRefreshableView,
+        MergeViewLogic.IMergeView,
+        IncomingChangesTree.IGetConflictResolution,
+        IIncomingChangesViewMenuOperations,
+        IncomingChangesViewMenu.IMetaMenuOperations
+    {
+
+        internal IncomingChangesTab(
+            WorkspaceInfo wkInfo,
+            IViewSwitcher switcher,
+            PlasticGUIClient plasticClient,
+            NewIncomingChangesUpdater newIncomingChangesUpdater,
+            EditorWindow parentWindow)
+        {
+            mWkInfo = wkInfo;
+            mSwitcher = switcher;
+            mPlasticClient = plasticClient;
+            mNewIncomingChangesUpdater = newIncomingChangesUpdater;
+            mParentWindow = parentWindow;
+            mGuiMessage = new UnityPlasticGuiMessage(parentWindow);
+
+            BuildComponents(mWkInfo);
+
+            mProgressControls = new ProgressControlsForViews();
+
+            PlasticNotifier plasticNotifier = new PlasticNotifier();
+
+            mMergeController = new MergeController(
+                mWkInfo,
+                null,
+                null,
+                EnumMergeType.IncomingMerge,
+                true,
+                plasticNotifier,
+                null);
+
+            mMergeViewLogic = new MergeViewLogic(
+                mWkInfo,
+                EnumMergeType.IncomingMerge,
+                true,
+                mMergeController,
+                plasticNotifier,
+                ShowIncomingChangesFrom.NotificationBar,
+                null,
+                mNewIncomingChangesUpdater,
+                null,
+                this,
+                NewChangesInWk.Build(mWkInfo, new BuildWorkspacekIsRelevantNewChange()),
+                mProgressControls,
+                null);
+
+            ((IRefreshableView)this).Refresh();
+        }
+
+        bool IIncomingChangesTab.IsVisible
+        {
+            get { return mIsVisible; }
+            set { mIsVisible = value; }
+        }
+
+        void IIncomingChangesTab.OnDisable()
+        {
+            TreeHeaderSettings.Save(
+                mIncomingChangesTreeView.multiColumnHeader.state,
+                UnityConstants.DEVELOPER_INCOMING_CHANGES_TABLE_SETTINGS_NAME);
+        }
+
+        void IIncomingChangesTab.Update()
+        {
+            mProgressControls.UpdateProgress(mParentWindow);
+        }
+
+        void IIncomingChangesTab.OnGUI()
+        {
+            if (Event.current.type == EventType.Layout)
+            {
+                mHasPendingDirectoryConflicts =
+                    MergeTreeResultParser.GetUnsolvedDirectoryConflictsCount(mResultConflicts) > 0;
+                mIsOperationRunning = mProgressControls.IsOperationRunning();
+            }
+
+            DoActionsToolbar(
+                mIsProcessMergesButtonVisible,
+                mIsCancelMergesButtonVisible,
+                mIsProcessMergesButtonEnabled,
+                mIsCancelMergesButtonEnabled,
+                mProcessMergesButtonText,
+                mHasPendingDirectoryConflicts,
+                mIsOperationRunning,
+                mPlasticClient,
+                mMergeViewLogic,
+                mProgressControls.ProgressData);
+
+            DoFileConflictsArea(
+                mPlasticClient,
+                mIncomingChangesTreeView,
+                mResultConflicts,
+                mSolvedFileConflicts,
+                mRootMountPoint,
+                mIsOperationRunning);
+
+            List<IncomingChangeInfo> selectedIncomingChanges =
+                mIncomingChangesTreeView.GetSelectedIncomingChanges();
+
+            if (GetSelectedIncomingChangesGroupInfo.For(
+                    selectedIncomingChanges).IsDirectoryConflictsSelection &&
+                !Mouse.IsRightMouseButtonPressed(Event.current))
+            {
+                DoDirectoryConflictResolutionPanel(
+                    selectedIncomingChanges,
+                    new Action<IncomingChangeInfo>(ResolveDirectoryConflict),
+                    mConflictResolutionStates);
+            }
+
+            if (mIsMessageLabelVisible)
+                DoInfoMessageArea(mMessageLabelText);
+
+            if (mIsErrorMessageLabelVisible)
+                DoErrorMessageArea(mErrorMessageLabelText);
+
+            if (mProgressControls.HasNotification())
+            {
+                DrawProgressForViews.ForNotificationArea(
+                    mProgressControls.ProgressData);
+            }
+        }
+
+        void IIncomingChangesTab.AutoRefresh()
+        {
+            BranchInfo workingBranch = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    workingBranch = OverlappedCalculator.GetWorkingBranch(
+                        mWkInfo.ClientPath);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.DisplayException(waiter.Exception);
+                        return;
+                    }
+
+                    mMergeController.UpdateMergeObjectInfoIfNeeded(workingBranch);
+                    mMergeViewLogic.AutoRefresh();
+                 });
+        }
+
+        void IRefreshableView.Refresh()
+        {
+            BranchInfo workingBranch = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    workingBranch = OverlappedCalculator.GetWorkingBranch(
+                        mWkInfo.ClientPath);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    if (waiter.Exception != null)
+                    {
+                        ExceptionsHandler.DisplayException(waiter.Exception);
+                        return;
+                    }
+
+                    mMergeController.UpdateMergeObjectInfoIfNeeded(workingBranch);
+                    mMergeViewLogic.Refresh();
+                });
+        }
+
+        void MergeViewLogic.IMergeView.UpdateData(
+            MergeTreeResult resultConflicts,
+            ExplainMergeData explainMergeData,
+            MergeSolvedFileConflicts solvedFileConflicts,
+            MountPointWithPath rootMountPoint,
+            bool isIncomingMerge,
+            bool isMergeTo,
+            bool isUpdateMerge,
+            bool mergeHasFinished)
+        {
+            HideMessage();
+
+            ShowProcessMergesButton(MergeViewTexts.GetProcessMergeButtonText(
+                MergeTreeResultParser.GetFileConflictsCount(resultConflicts) > 0,
+                true));
+
+            mResultConflicts = resultConflicts;
+            mSolvedFileConflicts = solvedFileConflicts;
+            mRootMountPoint = rootMountPoint;
+            mConflictResolutionStates.Clear();
+
+            UpdateFileConflictsTree(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    mResultConflicts,
+                    this,
+                    mRootMountPoint),
+                mIncomingChangesTreeView);
+        }
+
+        void MergeViewLogic.IMergeView.UpdateSolvedFileConflicts(
+            MergeSolvedFileConflicts solvedFileConflicts)
+        {
+            mIncomingChangesTreeView.UpdateSolvedFileConflicts(
+                solvedFileConflicts);
+        }
+
+        void MergeViewLogic.IMergeView.ShowMessage(
+            string title,
+            string message,
+            bool isErrorMessage)
+        {
+            if (isErrorMessage)
+            {
+                mErrorMessageLabelText = message;
+                mIsErrorMessageLabelVisible = true;
+                return;
+            }
+
+            mMessageLabelText = message;
+            mIsMessageLabelVisible = true;
+        }
+
+        string MergeViewLogic.IMergeView.GetComments(out bool bCancel)
+        {
+            bCancel = false;
+            return string.Empty;
+        }
+
+        void MergeViewLogic.IMergeView.DisableProcessMergesButton()
+        {
+            mIsProcessMergesButtonEnabled = false;
+        }
+
+        void MergeViewLogic.IMergeView.ShowCancelButton()
+        {
+            mIsCancelMergesButtonEnabled = true;
+            mIsCancelMergesButtonVisible = true;
+        }
+
+        void MergeViewLogic.IMergeView.HideCancelButton()
+        {
+            mIsCancelMergesButtonEnabled = false;
+            mIsCancelMergesButtonVisible = false;
+        }
+
+        SelectedIncomingChangesGroupInfo IIncomingChangesViewMenuOperations.GetSelectedIncomingChangesGroupInfo()
+        {
+            return IncomingChangesSelection.GetSelectedGroupInfo(mIncomingChangesTreeView);
+        }
+
+        string IncomingChangesTree.IGetConflictResolution.GetConflictResolution(
+            DirectoryConflict conflict)
+        {
+            return mMergeViewLogic.GetConflictResolution(conflict);
+        }
+
+        void IIncomingChangesViewMenuOperations.MergeContributors()
+        {
+            List<string> selectedPaths = IncomingChangesSelection.
+                GetPathsFromSelectedFileConflictsIncludingMeta(
+                    mIncomingChangesTreeView);
+
+            mMergeViewLogic.ProcessMerges(
+                mPlasticClient,
+                mSwitcher,
+                mGuiMessage,
+                selectedPaths,
+                MergeContributorType.MergeContributors,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        void IIncomingChangesViewMenuOperations.MergeKeepingSourceChanges()
+        {
+            List<string> selectedPaths = IncomingChangesSelection.
+                GetPathsFromSelectedFileConflictsIncludingMeta(
+                    mIncomingChangesTreeView);
+
+            mMergeViewLogic.ProcessMerges(
+                mPlasticClient,
+                mSwitcher,
+                mGuiMessage,
+                selectedPaths,
+                MergeContributorType.KeepSource,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        void IIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges()
+        {
+            List<string> selectedPaths = IncomingChangesSelection.
+                GetPathsFromSelectedFileConflictsIncludingMeta(
+                    mIncomingChangesTreeView);
+
+            mMergeViewLogic.ProcessMerges(
+                mPlasticClient,
+                mSwitcher,
+                mGuiMessage,
+                selectedPaths,
+                MergeContributorType.KeepDestination,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        void IIncomingChangesViewMenuOperations.DiffYoursWithIncoming()
+        {
+            IncomingChangeInfo incomingChange = IncomingChangesSelection.
+                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
+
+            if (incomingChange == null)
+                return;
+
+            DiffYoursWithIncoming(
+                incomingChange,
+                mWkInfo);
+        }
+
+        void IIncomingChangesViewMenuOperations.DiffIncomingChanges()
+        {
+            IncomingChangeInfo incomingChange = IncomingChangesSelection.
+                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
+
+            if (incomingChange == null)
+                return;
+
+            DiffIncomingChanges(
+                incomingChange,
+                mWkInfo);
+        }
+
+        void IncomingChangesViewMenu.IMetaMenuOperations.DiffIncomingChanges()
+        {
+            IncomingChangeInfo incomingChange = IncomingChangesSelection.
+                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
+
+            if (incomingChange == null)
+                return;
+
+
+            DiffIncomingChanges(
+                mIncomingChangesTreeView.GetMetaChange(incomingChange),
+                mWkInfo);
+        }
+
+        void IncomingChangesViewMenu.IMetaMenuOperations.DiffYoursWithIncoming()
+        {
+            IncomingChangeInfo incomingChange = IncomingChangesSelection.
+                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
+
+            if (incomingChange == null)
+                return;
+
+            DiffYoursWithIncoming(
+                mIncomingChangesTreeView.GetMetaChange(incomingChange),
+                mWkInfo);
+        }
+
+        bool IncomingChangesViewMenu.IMetaMenuOperations.SelectionHasMeta()
+        {
+            return mIncomingChangesTreeView.SelectionHasMeta();
+        }
+
+        static void DiffYoursWithIncoming(
+            IncomingChangeInfo incomingChange,
+            WorkspaceInfo wkInfo)
+        {
+            DiffOperation.DiffYoursWithIncoming(
+                wkInfo,
+                incomingChange.GetMount(),
+                incomingChange.GetRevision(),
+                incomingChange.GetPath(),
+                xDiffLauncher: null,
+                imageDiffLauncher: null);
+        }
+
+        static void DiffIncomingChanges(
+            IncomingChangeInfo incomingChange,
+            WorkspaceInfo wkInfo)
+        {
+            DiffOperation.DiffRevisions(
+                wkInfo,
+                incomingChange.GetMount().RepSpec,
+                incomingChange.GetBaseRevision(),
+                incomingChange.GetRevision(),
+                incomingChange.GetPath(),
+                incomingChange.GetPath(),
+                true,
+                xDiffLauncher: null,
+                imageDiffLauncher: null);
+        }
+
+        void ShowProcessMergesButton(string processMergesButtonText)
+        {
+            mProcessMergesButtonText = processMergesButtonText;
+            mIsProcessMergesButtonEnabled = true;
+            mIsProcessMergesButtonVisible = true;
+        }
+
+        void HideMessage()
+        {
+            mMessageLabelText = string.Empty;
+            mIsMessageLabelVisible = false;
+
+            mErrorMessageLabelText = string.Empty;
+            mIsErrorMessageLabelVisible = false;
+        }
+
+        static void DoDirectoryConflictResolutionPanel(
+            List<IncomingChangeInfo> selectedChangeInfos,
+            Action<IncomingChangeInfo> resolveDirectoryConflictAction,
+            Dictionary<DirectoryConflict, ConflictResolutionState> conflictResolutionStates)
+        {
+            IncomingChangeInfo selectedDirectoryConflict = selectedChangeInfos[0];
+
+            if (selectedDirectoryConflict.DirectoryConflict.IsResolved())
+                return;
+
+            DirectoryConflictUserInfo conflictUserInfo;
+            DirectoryConflictAction[] conflictActions;
+
+            DirectoryConflictResolutionInfo.FromDirectoryConflict(
+                selectedDirectoryConflict.GetMount(),
+                selectedDirectoryConflict.DirectoryConflict,
+                out conflictUserInfo,
+                out conflictActions);
+
+            ConflictResolutionState conflictResolutionState = GetConflictResolutionState(
+                selectedDirectoryConflict.DirectoryConflict,
+                conflictActions,
+                conflictResolutionStates);
+
+            int pendingSelectedConflictsCount = GetPendingConflictsCount(
+                selectedChangeInfos);
+
+            DrawDirectoryResolutionPanel.ForConflict(
+                selectedDirectoryConflict,
+                (pendingSelectedConflictsCount <= 1) ? 0 : pendingSelectedConflictsCount - 1,
+                conflictUserInfo,
+                conflictActions,
+                resolveDirectoryConflictAction,
+                ref conflictResolutionState);
+        }
+
+        void ResolveDirectoryConflict(IncomingChangeInfo conflict)
+        {
+            ConflictResolutionState state;
+
+            if (!mConflictResolutionStates.TryGetValue(conflict.DirectoryConflict, out state))
+                return;
+
+            List<DirectoryConflictResolutionData> conflictResolutions =
+                new List<DirectoryConflictResolutionData>();
+
+            AddConflictResolution(
+                conflict,
+                state.ResolveAction,
+                state.RenameValue,
+                conflictResolutions);
+
+            IncomingChangeInfo metaConflict =
+                mIncomingChangesTreeView.GetMetaChange(conflict);
+
+            if (metaConflict != null)
+            {
+                AddConflictResolution(
+                    metaConflict,
+                    state.ResolveAction,
+                    MetaPath.GetMetaPath(state.RenameValue),
+                    conflictResolutions);
+            }
+
+            if (state.IsApplyActionsForNextConflictsChecked)
+            {
+                foreach (IncomingChangeInfo otherConflict in mIncomingChangesTreeView.GetSelectedIncomingChanges())
+                {
+                    AddConflictResolution(
+                        otherConflict,
+                        state.ResolveAction,
+                        state.RenameValue,
+                        conflictResolutions);
+                }
+            }
+
+            mMergeViewLogic.ResolveDirectoryConflicts(conflictResolutions);
+        }
+
+        static void AddConflictResolution(
+            IncomingChangeInfo conflict,
+            DirectoryConflictResolveActions resolveAction,
+            string renameValue,
+            List<DirectoryConflictResolutionData> conflictResolutions)
+        {
+            conflictResolutions.Add(new DirectoryConflictResolutionData(
+                conflict.DirectoryConflict,
+                conflict.Xlink,
+                conflict.GetMount().Mount,
+                resolveAction,
+                renameValue));
+        }
+
+        void DoActionsToolbar(
+            bool isProcessMergesButtonVisible,
+            bool isCancelMergesButtonVisible,
+            bool isProcessMergesButtonEnabled,
+            bool isCancelMergesButtonEnabled,
+            string processMergesButtonText,
+            bool hasPendingDirectoryConflictsCount,
+            bool isOperationRunning,
+            PlasticGUIClient plasticClient,
+            MergeViewLogic mergeViewLogic,
+            ProgressControlsForViews.Data progressData)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            if (isProcessMergesButtonVisible)
+            {
+                DoProcessMergesButton(
+                    isProcessMergesButtonEnabled && !hasPendingDirectoryConflictsCount,
+                    processMergesButtonText,
+                    mSwitcher,
+                    mPlasticClient,
+                    mGuiMessage,
+                    mergeViewLogic);
+            }
+
+            if (isCancelMergesButtonVisible)
+            {
+                DoCancelMergesButton(
+                    isCancelMergesButtonEnabled,
+                    mergeViewLogic);
+            }
+
+            if (hasPendingDirectoryConflictsCount)
+            {
+                GUILayout.Space(5);
+                DoWarningMessage();
+            }
+
+            if (isOperationRunning)
+            {
+                DrawProgressForViews.ForIndeterminateProgress(
+                    progressData);
+            }
+
+            GUILayout.FlexibleSpace();
+
+            DoRefreshButton(
+                !isOperationRunning,
+                plasticClient,
+                mergeViewLogic);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoFileConflictsArea(
+            PlasticGUIClient plasticClient,
+            IncomingChangesTreeView incomingChangesTreeView,
+            MergeTreeResult conflicts,
+            MergeSolvedFileConflicts solvedConflicts,
+            MountPointWithPath mount,
+            bool isOperationRunning)
+        {
+            DoConflictsHeader(
+                conflicts,
+                solvedConflicts,
+                mount);
+
+            DoConflictsTree(
+                incomingChangesTreeView,
+                isOperationRunning);
+        }
+
+        static void DoConflictsTree(
+            IncomingChangesTreeView incomingChangesTreeView,
+            bool isOperationRunning)
+        {
+            GUI.enabled = !isOperationRunning;
+
+            Rect rect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            incomingChangesTreeView.OnGUI(rect);
+
+            GUI.enabled = true;
+        }
+
+        static void DoConflictsHeader(
+            MergeTreeResult conflicts,
+            MergeSolvedFileConflicts solvedFileConflicts,
+            MountPointWithPath mount)
+        {
+            if (conflicts == null || mount == null)
+                return;
+
+            EditorGUILayout.BeginHorizontal();
+
+            DoDirectoryConflictsHeader(conflicts);
+            DoFileConflictsHeader(
+                conflicts,
+                solvedFileConflicts,
+                mount);
+
+            GUILayout.FlexibleSpace();
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoDirectoryConflictsHeader(MergeTreeResult conflicts)
+        {
+            int directoryConflictsCount =
+                MergeTreeResultParser.GetDirectoryConflictsCount(conflicts);
+            int pendingDirectoryConflictsCount =
+                MergeTreeResultParser.GetUnsolvedDirectoryConflictsCount(
+                    conflicts);
+
+            if (directoryConflictsCount == 0)
+                return;
+
+            GUIStyle pendingDirectoryConflictsOfTotalStyle =
+                pendingDirectoryConflictsCount > 0 ?
+                UnityStyles.IncomingChangesTab.RedPendingConflictsOfTotalLabel :
+                UnityStyles.IncomingChangesTab.GreenPendingConflictsOfTotalLabel;
+
+            GUILayout.Label(
+                string.Format("{0}/{1}", pendingDirectoryConflictsCount, directoryConflictsCount),
+                pendingDirectoryConflictsOfTotalStyle);
+
+            GUILayout.Label(
+                MergeViewTexts.GetDirectoryConflictsUnsolvedCaption(directoryConflictsCount),
+                UnityStyles.IncomingChangesTab.PendingConflictsLabel);
+        }
+
+        static void DoFileConflictsHeader(
+            MergeTreeResult conflicts,
+            MergeSolvedFileConflicts solvedFileConflicts,
+            MountPointWithPath mount)
+        {
+            int fileConflictsCount = MergeTreeResultParser.GetFileConflictsCount(conflicts);
+            int pendingFileConflictsCount = MergeTreeResultParser.GetUnsolvedFileConflictsCount(
+                conflicts, mount.Id, solvedFileConflicts);
+
+            GUIStyle pendingFileConflictsOfTotalStyle =
+                pendingFileConflictsCount > 0 ?
+                UnityStyles.IncomingChangesTab.RedPendingConflictsOfTotalLabel :
+                UnityStyles.IncomingChangesTab.GreenPendingConflictsOfTotalLabel;
+
+            GUILayout.Label(
+                string.Format("{0}/{1}", pendingFileConflictsCount, fileConflictsCount),
+                pendingFileConflictsOfTotalStyle);
+
+            GUILayout.Label(
+                MergeViewTexts.GetFileConflictsCaption(fileConflictsCount, true),
+                UnityStyles.IncomingChangesTab.PendingConflictsLabel);
+
+            GUILayout.Space(5);
+
+            GUILayout.Label(
+                MergeViewTexts.GetChangesToApplyCaption(
+                    MergeTreeResultParser.GetChangesToApplySummary(conflicts)),
+                UnityStyles.IncomingChangesTab.ChangesToApplySummaryLabel);
+        }
+
+        static void DoProcessMergesButton(
+            bool isEnabled,
+            string processMergesButtonText,
+            IViewSwitcher switcher,
+            PlasticGUIClient plasticClient,
+            GuiMessage.IGuiMessage guiMessage,
+            MergeViewLogic mergeViewLogic)
+        {
+            GUI.enabled = isEnabled;
+
+            if (DrawActionButton.For(processMergesButtonText))
+            {
+                mergeViewLogic.ProcessMerges(
+                    plasticClient,
+                    switcher,
+                    guiMessage,
+                    new List<string>(),
+                    MergeContributorType.MergeContributors,
+                    RefreshAsset.UnityAssetDatabase);
+            }
+
+            GUI.enabled = true;
+        }
+
+        void DoCancelMergesButton(
+            bool isEnabled,
+            MergeViewLogic mergeViewLogic)
+        {
+            GUI.enabled = isEnabled;
+
+            if (DrawActionButton.For(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+            {
+                mergeViewLogic.Cancel();
+
+                mIsCancelMergesButtonEnabled = false;
+            }
+
+            GUI.enabled = true;
+        }
+
+        static void DoWarningMessage()
+        {
+            string label = PlasticLocalization.GetString(PlasticLocalization.Name.SolveConflictsInLable);
+
+            GUILayout.Label(
+                new GUIContent(label, Images.GetWarnIcon()),
+                UnityStyles.IncomingChangesTab.HeaderWarningLabel);
+        }
+
+        static void DoRefreshButton(
+            bool isEnabled,
+            PlasticGUIClient plasticClient,
+            MergeViewLogic mergeViewLogic)
+        {
+            GUI.enabled = isEnabled;
+
+            if (GUILayout.Button(new GUIContent(
+                    Images.GetRefreshIcon()), EditorStyles.toolbarButton))
+                mergeViewLogic.Refresh();
+
+            GUI.enabled = true;
+        }
+
+        void UpdateFileConflictsTree(
+            IncomingChangesTree incomingChangesTree,
+            IncomingChangesTreeView incomingChangesTreeView)
+        {
+            UnityIncomingChangesTree unityIncomingChangesTree = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    unityIncomingChangesTree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                        incomingChangesTree);
+                    incomingChangesTree.ResolveUserNames(
+                        new IncomingChangesTree.ResolveUserName());
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    incomingChangesTreeView.BuildModel(unityIncomingChangesTree);
+                    incomingChangesTreeView.Sort();
+                    incomingChangesTreeView.Reload();
+
+                    incomingChangesTreeView.SelectFirstUnsolvedDirectoryConflict();
+                });
+        }
+
+        static void DoInfoMessageArea(string message)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            EditorGUILayout.HelpBox(message, MessageType.Info);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoErrorMessageArea(string message)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            EditorGUILayout.HelpBox(message, MessageType.Error);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void BuildComponents(WorkspaceInfo wkInfo)
+        {
+            IncomingChangesTreeHeaderState incomingChangesHeaderState =
+                IncomingChangesTreeHeaderState.GetDefault();
+            TreeHeaderSettings.Load(incomingChangesHeaderState,
+                UnityConstants.DEVELOPER_INCOMING_CHANGES_TABLE_SETTINGS_NAME,
+                (int)IncomingChangesTreeColumn.Path, true);
+
+            mIncomingChangesTreeView = new IncomingChangesTreeView(
+                wkInfo, incomingChangesHeaderState,
+                IncomingChangesTreeHeaderState.GetColumnNames(),
+                new IncomingChangesViewMenu(this, this));
+            mIncomingChangesTreeView.Reload();
+        }
+
+        static ConflictResolutionState GetConflictResolutionState(
+            DirectoryConflict directoryConflict,
+            DirectoryConflictAction[] conflictActions,
+            Dictionary<DirectoryConflict, ConflictResolutionState> conflictResoltionStates)
+        {
+            ConflictResolutionState result;
+
+            if (conflictResoltionStates.TryGetValue(directoryConflict, out result))
+                return result;
+
+            result = ConflictResolutionState.Build(directoryConflict, conflictActions);
+
+            conflictResoltionStates.Add(directoryConflict, result);
+            return result;
+        }
+
+        static int GetPendingConflictsCount(
+            List<IncomingChangeInfo> selectedChangeInfos)
+        {
+            int result = 0;
+            foreach (IncomingChangeInfo changeInfo in selectedChangeInfos)
+            {
+                if (changeInfo.DirectoryConflict.IsResolved())
+                    continue;
+
+                result++;
+            }
+
+            return result;
+        }
+
+        bool mIsVisible;
+        bool mIsProcessMergesButtonVisible;
+        bool mIsCancelMergesButtonVisible;
+        bool mIsMessageLabelVisible;
+        bool mIsErrorMessageLabelVisible;
+
+        bool mIsProcessMergesButtonEnabled;
+        bool mIsCancelMergesButtonEnabled;
+        bool mHasPendingDirectoryConflicts;
+        bool mIsOperationRunning;
+
+        string mProcessMergesButtonText;
+        string mMessageLabelText;
+        string mErrorMessageLabelText;
+
+        IncomingChangesTreeView mIncomingChangesTreeView;
+
+        MergeTreeResult mResultConflicts;
+        MergeSolvedFileConflicts mSolvedFileConflicts;
+        MountPointWithPath mRootMountPoint;
+
+        Dictionary<DirectoryConflict, ConflictResolutionState> mConflictResolutionStates =
+            new Dictionary<DirectoryConflict, ConflictResolutionState>();
+
+        readonly ProgressControlsForViews mProgressControls;
+        readonly MergeViewLogic mMergeViewLogic;
+        readonly MergeController mMergeController;
+        readonly GuiMessage.IGuiMessage mGuiMessage;
+        readonly EditorWindow mParentWindow;
+        readonly NewIncomingChangesUpdater mNewIncomingChangesUpdater;
+        readonly PlasticGUIClient mPlasticClient;
+        readonly IViewSwitcher mSwitcher;
+        readonly WorkspaceInfo mWkInfo;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTab.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTab.cs.meta
new file mode 100644
index 0000000..8d8bd3a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTab.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4f04b21b06239da4f95a5a9753647440
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeHeaderState.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeHeaderState.cs
new file mode 100644
index 0000000..6ce6e01
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeHeaderState.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    internal enum IncomingChangesTreeColumn
+    {
+        Path,
+        Size,
+        Author,
+        Details,
+        Resolution
+    }
+
+    [Serializable]
+    internal class IncomingChangesTreeHeaderState : MultiColumnHeaderState, ISerializationCallbackReceiver
+    {
+        internal static IncomingChangesTreeHeaderState GetDefault()
+        {
+            return new IncomingChangesTreeHeaderState(BuildColumns());
+        }
+
+        internal static List<string> GetColumnNames()
+        {
+            List<string> result = new List<string>();
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.SizeColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.CreatedByColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.DetailsColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.ResolutionMethodColumn));
+            return result;
+        }
+
+        internal static string GetColumnName(IncomingChangesTreeColumn column)
+        {
+            switch (column)
+            {
+                case IncomingChangesTreeColumn.Path:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn);
+                case IncomingChangesTreeColumn.Size:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.SizeColumn);
+                case IncomingChangesTreeColumn.Author:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.AuthorColumn);
+                case IncomingChangesTreeColumn.Details:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.DetailsColumn);
+                case IncomingChangesTreeColumn.Resolution:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.ResolutionMethodColumn);
+                default:
+                    return null;
+            }
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            if (mHeaderTitles != null)
+                TreeHeaderColumns.SetTitles(columns, mHeaderTitles);
+
+            if (mColumsAllowedToggleVisibility != null)
+                TreeHeaderColumns.SetVisibilities(columns, mColumsAllowedToggleVisibility);
+        }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+        }
+
+        static Column[] BuildColumns()
+        {
+            return new Column[]
+                {
+                    new Column()
+                    {
+                        width = 450,
+                        headerContent = new GUIContent(
+                            GetColumnName(IncomingChangesTreeColumn.Path)),
+                        minWidth = 200,
+                        allowToggleVisibility = false,
+                    },
+                    new Column()
+                    {
+                        width = 150,
+                        headerContent = new GUIContent(
+                            GetColumnName(IncomingChangesTreeColumn.Size)),
+                        minWidth = 45
+                    },
+                    new Column()
+                    {
+                        width = 150,
+                        headerContent = new GUIContent(
+                            GetColumnName(IncomingChangesTreeColumn.Author)),
+                        minWidth = 80
+                    },
+                    new Column()
+                    {
+                        width = 200,
+                        headerContent = new GUIContent(
+                            GetColumnName(IncomingChangesTreeColumn.Details)),
+                        minWidth = 100
+                    },
+                    new Column()
+                    {
+                        width = 250,
+                        headerContent = new GUIContent(
+                            GetColumnName(IncomingChangesTreeColumn.Resolution)),
+                        minWidth = 120
+                    }
+                };
+        }
+
+        IncomingChangesTreeHeaderState(Column[] columns)
+            : base(columns)
+        {
+            if (mHeaderTitles == null)
+                mHeaderTitles = TreeHeaderColumns.GetTitles(columns);
+
+            if (mColumsAllowedToggleVisibility == null)
+                mColumsAllowedToggleVisibility = TreeHeaderColumns.GetVisibilities(columns);
+        }
+
+        [SerializeField]
+        string[] mHeaderTitles;
+
+        [SerializeField]
+        bool[] mColumsAllowedToggleVisibility;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeHeaderState.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeHeaderState.cs.meta
new file mode 100644
index 0000000..ffb5ca3
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeHeaderState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6c8b04d6403125b4ca51861863f386ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeView.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeView.cs
new file mode 100644
index 0000000..551c15f
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeView.cs
@@ -0,0 +1,577 @@
+using System.Collections.Generic;
+using System.IO;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.Client.BaseCommands.Merge;
+using Codice.Client.Common;
+using Codice.CM.Common;
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    internal class IncomingChangesTreeView : TreeView
+    {
+        internal IncomingChangesTreeView(
+            WorkspaceInfo wkInfo,
+            IncomingChangesTreeHeaderState headerState,
+            List<string> columnNames,
+            IncomingChangesViewMenu menu)
+            : base(new TreeViewState())
+        {
+            mWkInfo = wkInfo;
+            mColumnNames = columnNames;
+            mMenu = menu;
+
+            multiColumnHeader = new MultiColumnHeader(headerState);
+            multiColumnHeader.canSort = true;
+            multiColumnHeader.sortingChanged += SortingChanged;
+
+            customFoldoutYOffset = UnityConstants.TREEVIEW_FOLDOUT_Y_OFFSET;
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        protected override bool CanChangeExpandedState(TreeViewItem item)
+        {
+            return item is ChangeCategoryTreeViewItem;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem rootItem)
+        {
+            try
+            {
+                RegenerateRows(
+                    mIncomingChangesTree,
+                    mTreeViewItemIds,
+                    this,
+                    rootItem,
+                    mRows,
+                    mExpandCategories);
+            }
+            finally
+            {
+                mExpandCategories = false;
+            }
+
+            return mRows;
+        }
+
+        protected override void CommandEventHandling()
+        {
+            // NOTE - empty override to prevent crash when pressing ctrl-a in the treeview
+        }
+
+        protected override void ContextClickedItem(int id)
+        {
+            mMenu.Popup();
+            Repaint();
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            DrawTreeViewItem.InitializeStyles();
+
+            if (args.item is ChangeCategoryTreeViewItem)
+            {
+                ChangeCategoryTreeViewItem categoryItem =
+                    (ChangeCategoryTreeViewItem)args.item;
+
+                CategoryTreeViewItemGUI(
+                    args.rowRect, rowHeight,
+                    categoryItem,
+                    GetSolvedChildrenCount(categoryItem.Category, mSolvedFileConflicts),
+                    args.selected,
+                    args.focused);
+                return;
+            }
+
+            if (args.item is ChangeTreeViewItem)
+            {
+                ChangeTreeViewItem changeTreeViewItem =
+                    (ChangeTreeViewItem)args.item;
+
+                IncomingChangeInfo changeInfo =
+                    changeTreeViewItem.ChangeInfo;
+
+                bool isCurrentConflict = IsCurrent.Conflict(
+                    changeInfo,
+                    mIncomingChangesTree.GetMetaChange(changeInfo),
+                    mSolvedFileConflicts);
+
+                bool isSolvedConflict = IsSolved.Conflict(
+                    changeInfo,
+                    mIncomingChangesTree.GetMetaChange(changeInfo),
+                    mSolvedFileConflicts);
+
+                IncomingChangeTreeViewItemGUI(
+                    mWkInfo.ClientPath,
+                    mIncomingChangesTree,
+                    this,
+                    changeTreeViewItem,
+                    args,
+                    isCurrentConflict,
+                    isSolvedConflict);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        internal void SelectFirstUnsolvedDirectoryConflict()
+        {
+            foreach (IncomingChangesCategory category in mIncomingChangesTree.GetNodes())
+            {
+                if (category.CategoryType != IncomingChangesCategory.Type.DirectoryConflicts)
+                    continue;
+
+                foreach (IncomingChangeInfo changeInfo in category.GetChanges())
+                {
+                    if (changeInfo.DirectoryConflict.IsResolved())
+                        continue;
+
+                    int itemId = -1;
+                    if (mTreeViewItemIds.TryGetInfoItemId(changeInfo, out itemId))
+                    {
+                        SetSelection(new List<int>() { itemId });
+                        return;
+                    }
+                }
+            }
+        }
+
+        internal void BuildModel(UnityIncomingChangesTree tree)
+        {
+            mTreeViewItemIds.Clear();
+
+            mIncomingChangesTree = tree;
+            mSolvedFileConflicts = null;
+
+            mExpandCategories = true;
+        }
+
+        internal void Sort()
+        {
+            int sortedColumnIdx = multiColumnHeader.state.sortedColumnIndex;
+            bool sortAscending = multiColumnHeader.IsSortedAscending(sortedColumnIdx);
+
+            mIncomingChangesTree.Sort(
+                mColumnNames[sortedColumnIdx],
+                sortAscending);
+        }
+
+        internal void UpdateSolvedFileConflicts(
+            MergeSolvedFileConflicts solvedFileConflicts)
+        {
+            mSolvedFileConflicts = solvedFileConflicts;
+        }
+
+        internal IncomingChangeInfo GetMetaChange(IncomingChangeInfo change)
+        {
+            if (change == null)
+                return null;
+
+            return mIncomingChangesTree.GetMetaChange(change);
+        }
+
+        internal void FillWithMeta(List<IncomingChangeInfo> changes)
+        {
+            mIncomingChangesTree.FillWithMeta(changes);
+        }
+
+        internal bool SelectionHasMeta()
+        {
+            IncomingChangeInfo selectedChangeInfo = GetSelectedIncomingChange();
+
+            if (selectedChangeInfo == null)
+                return false;
+
+            return mIncomingChangesTree.HasMeta(selectedChangeInfo);
+        }
+
+        internal IncomingChangeInfo GetSelectedIncomingChange()
+        {
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count != 1)
+                return null;
+
+            int selectedId = selectedIds[0];
+
+            foreach (KeyValuePair<IncomingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (selectedId == item.Value)
+                    return item.Key;
+            }
+
+            return null;
+        }
+
+        internal List<IncomingChangeInfo> GetSelectedIncomingChanges()
+        {
+            List<IncomingChangeInfo> result = new List<IncomingChangeInfo>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<IncomingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                result.Add(item.Key);
+            }
+
+            return result;
+        }
+
+        internal List<IncomingChangeInfo> GetSelectedFileConflicts()
+        {
+            List<IncomingChangeInfo> result = new List<IncomingChangeInfo>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<IncomingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                if (item.Key.CategoryType !=
+                        IncomingChangesCategory.Type.FileConflicts)
+                    continue;
+
+                result.Add(item.Key);
+            }
+
+            return result;
+        }
+
+        void SortingChanged(MultiColumnHeader multiColumnHeader)
+        {
+            Sort();
+
+            Reload();
+        }
+
+        static void RegenerateRows(
+            UnityIncomingChangesTree incomingChangesTree,
+            TreeViewItemIds<IncomingChangesCategory, IncomingChangeInfo> treeViewItemIds,
+            IncomingChangesTreeView treeView,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows,
+            bool expandCategories)
+        {
+            if (incomingChangesTree == null)
+                return;
+
+            ClearRows(rootItem, rows);
+
+            List<IncomingChangesCategory> categories = incomingChangesTree.GetNodes();
+
+            if (categories == null)
+                return;
+
+            List<int> categoriesToExpand = new List<int>();
+
+            foreach (IncomingChangesCategory category in categories)
+            {
+                int categoryId;
+                if (!treeViewItemIds.TryGetCategoryItemId(category, out categoryId))
+                    categoryId = treeViewItemIds.AddCategoryItem(category);
+
+                ChangeCategoryTreeViewItem categoryTreeViewItem =
+                    new ChangeCategoryTreeViewItem(categoryId, category);
+
+                rootItem.AddChild(categoryTreeViewItem);
+                rows.Add(categoryTreeViewItem);
+
+                if (!ShouldExpandCategory(
+                        treeView,
+                        categoryTreeViewItem,
+                        expandCategories,
+                        categories.Count))
+                    continue;
+
+                categoriesToExpand.Add(categoryTreeViewItem.id);
+
+                foreach (IncomingChangeInfo changeInfo in category.GetChanges())
+                {
+                    int differenceId;
+                    if (!treeViewItemIds.TryGetInfoItemId(changeInfo, out differenceId))
+                        differenceId = treeViewItemIds.AddInfoItem(changeInfo);
+
+                    TreeViewItem changeTreeViewItem =
+                        new ChangeTreeViewItem(differenceId, changeInfo);
+
+                    categoryTreeViewItem.AddChild(changeTreeViewItem);
+                    rows.Add(changeTreeViewItem);
+                }
+            }
+
+            treeView.state.expandedIDs = categoriesToExpand;
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static void CategoryTreeViewItemGUI(
+            Rect rowRect,
+            float rowHeight,
+            ChangeCategoryTreeViewItem item,
+            int solvedChildrenCount,
+            bool isSelected,
+            bool isFocused)
+        {
+            Texture icon = GetCategoryIcon(item.Category.CategoryType);
+            string label = item.Category.GetHeaderText();
+
+            DefaultStyles.label = GetCategoryStyle(
+                item.Category,
+                solvedChildrenCount,
+                isSelected);
+
+            DrawTreeViewItem.ForCategoryItem(
+                rowRect,
+                rowHeight,
+                item.depth,
+                icon,
+                label,
+                isSelected,
+                isFocused);
+
+            DefaultStyles.label = UnityStyles.Tree.Label;
+        }
+
+        static void IncomingChangeTreeViewItemGUI(
+            string wkPath,
+            UnityIncomingChangesTree incomingChangesTree,
+            IncomingChangesTreeView treeView,
+            ChangeTreeViewItem item,
+            RowGUIArgs args,
+            bool isCurrentConflict,
+            bool isSolvedConflict)
+        {
+            for (int visibleColumnIdx = 0; visibleColumnIdx < args.GetNumVisibleColumns(); visibleColumnIdx++)
+            {
+                Rect cellRect = args.GetCellRect(visibleColumnIdx);
+
+                IncomingChangesTreeColumn column =
+                    (IncomingChangesTreeColumn)args.GetColumn(visibleColumnIdx);
+
+                IncomingChangeTreeViewItemCellGUI(
+                    wkPath,
+                    cellRect,
+                    treeView.rowHeight,
+                    incomingChangesTree,
+                    treeView,
+                    item,
+                    column,
+                    args.selected,
+                    args.focused,
+                    isCurrentConflict,
+                    isSolvedConflict);
+            }
+        }
+
+        static void IncomingChangeTreeViewItemCellGUI(
+            string wkPath,
+            Rect rect,
+            float rowHeight,
+            UnityIncomingChangesTree incomingChangesTree,
+            IncomingChangesTreeView treeView,
+            ChangeTreeViewItem item,
+            IncomingChangesTreeColumn column,
+            bool isSelected,
+            bool isFocused,
+            bool isCurrentConflict,
+            bool isSolvedConflict)
+        {
+            IncomingChangeInfo incomingChange = item.ChangeInfo;
+
+            string label = incomingChange.GetColumnText(
+                IncomingChangesTreeHeaderState.GetColumnName(column));
+
+            if (column == IncomingChangesTreeColumn.Path)
+            {
+                if (incomingChangesTree.HasMeta(item.ChangeInfo))
+                    label = string.Concat(label, UnityConstants.TREEVIEW_META_LABEL);
+
+                Texture icon = GetIcon(wkPath, incomingChange);
+
+                GetChangesOverlayIcon.Data overlayIconData =
+                    GetChangesOverlayIcon.ForPlasticIncomingChange(
+                        incomingChange, isSolvedConflict);
+
+                DrawTreeViewItem.ForItemCell(
+                    rect,
+                    rowHeight,
+                    item.depth,
+                    icon,
+                    overlayIconData,
+                    label,
+                    isSelected,
+                    isFocused,
+                    isCurrentConflict,
+                    false);
+
+                return;
+            }
+
+            if (column == IncomingChangesTreeColumn.Size)
+            {
+                DrawTreeViewItem.ForSecondaryLabelRightAligned(
+                    rect, label, isSelected, isFocused, isCurrentConflict);
+                return;
+            }
+
+            DrawTreeViewItem.ForSecondaryLabel(
+                rect, label, isSelected, isFocused, isCurrentConflict);
+        }
+
+        static Texture GetCategoryIcon(
+            IncomingChangesCategory.Type categoryType)
+        {
+            switch (categoryType)
+            {
+                case IncomingChangesCategory.Type.DirectoryConflicts:
+                case IncomingChangesCategory.Type.FileConflicts:
+                    return Images.GetImage(Images.Name.IconMergeConflict);
+                case IncomingChangesCategory.Type.Changed:
+                    return Images.GetImage(Images.Name.IconChanged);
+                case IncomingChangesCategory.Type.Moved:
+                    return Images.GetImage(Images.Name.IconMoved);
+                case IncomingChangesCategory.Type.Deleted:
+                    return Images.GetImage(Images.Name.IconDeleted);
+                case IncomingChangesCategory.Type.Added:
+                    return Images.GetImage(Images.Name.IconAdded);
+                default:
+                    return null;
+            }
+        }
+
+        static Texture GetIcon(
+            string wkPath,
+            IncomingChangeInfo incomingChange)
+        {
+            RevisionInfo revInfo = incomingChange.GetRevision();
+            bool isDirectory = revInfo.
+                Type == EnumRevisionType.enDirectory;
+
+            if (isDirectory || incomingChange.IsXLink())
+                return Images.GetDirectoryIcon();
+
+            string fullPath = WorkspacePath.GetWorkspacePathFromCmPath(
+                wkPath,
+                incomingChange.GetPath(),
+                Path.DirectorySeparatorChar);
+
+            return Images.GetFileIcon(fullPath);
+        }
+
+        static GUIStyle GetCategoryStyle(
+            IncomingChangesCategory category,
+            int solvedChildrenCount,
+            bool isSelected)
+        {
+            if (isSelected)
+                return UnityStyles.Tree.Label;
+
+            if (category.CategoryType == IncomingChangesCategory.Type.FileConflicts ||
+                category.CategoryType == IncomingChangesCategory.Type.DirectoryConflicts)
+            {
+                return category.GetChangesCount() > solvedChildrenCount ?
+                    UnityStyles.Tree.RedLabel : UnityStyles.Tree.GreenLabel;
+            }
+
+            return UnityStyles.Tree.Label;
+        }
+
+        static bool ShouldExpandCategory(
+            IncomingChangesTreeView treeView,
+            ChangeCategoryTreeViewItem categoryTreeViewItem,
+            bool expandCategories,
+            int categoriesCount)
+        {
+            if (expandCategories)
+            {
+                if (categoriesCount == 1)
+                    return true;
+
+                if (categoryTreeViewItem.Category.CategoryType ==
+                    IncomingChangesCategory.Type.FileConflicts)
+                    return true;
+
+                if (categoryTreeViewItem.Category.GetChangesCount() >
+                    NODES_TO_EXPAND_CATEGORY)
+                    return false;
+
+                return true;
+            }
+
+            return treeView.IsExpanded(categoryTreeViewItem.id);
+        }
+
+        static int GetSolvedChildrenCount(
+            IncomingChangesCategory category,
+            MergeSolvedFileConflicts solvedFileConflicts)
+        {
+            int solvedDirConflicts = 0;
+            if (category.CategoryType == IncomingChangesCategory.Type.DirectoryConflicts)
+            {
+                foreach (IncomingChangeInfo change in category.GetChanges())
+                {
+                    if (change.DirectoryConflict.IsResolved())
+                        solvedDirConflicts++;
+                }
+
+                return solvedDirConflicts;
+            }
+
+            return (solvedFileConflicts == null) ? 0 :
+                solvedFileConflicts.GetCount();
+        }
+
+        bool mExpandCategories;
+
+        TreeViewItemIds<IncomingChangesCategory, IncomingChangeInfo> mTreeViewItemIds =
+            new TreeViewItemIds<IncomingChangesCategory, IncomingChangeInfo>();
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        MergeSolvedFileConflicts mSolvedFileConflicts;
+        UnityIncomingChangesTree mIncomingChangesTree;
+
+        readonly IncomingChangesViewMenu mMenu;
+        readonly List<string> mColumnNames;
+        readonly WorkspaceInfo mWkInfo;
+
+        const int NODES_TO_EXPAND_CATEGORY = 10;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeView.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeView.cs.meta
new file mode 100644
index 0000000..1985b88
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesTreeView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1e0aed0a10caba04583f2474f8279b27
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesViewMenu.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesViewMenu.cs
new file mode 100644
index 0000000..ac4720c
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesViewMenu.cs
@@ -0,0 +1,217 @@
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    internal class IncomingChangesViewMenu
+    {
+        internal interface IMetaMenuOperations
+        {
+            void DiffIncomingChanges();
+            void DiffYoursWithIncoming();
+            bool SelectionHasMeta();
+        }
+
+        internal IncomingChangesViewMenu(
+            IIncomingChangesViewMenuOperations incomingChangesViewMenuOperations,
+            IMetaMenuOperations incomingChangesMetaMenuOperations)
+        {
+            mIncomingChangesViewMenuOperations = incomingChangesViewMenuOperations;
+            mIncomingChangesMetaMenuOperations = incomingChangesMetaMenuOperations;
+
+            BuildComponents();
+        }
+
+        internal void Popup()
+        {
+            GenericMenu menu = new GenericMenu();
+
+            UpdateMenuItems(menu);
+
+            menu.ShowAsContext();
+        }
+
+        void MergeSelectedFilesMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.MergeContributors();
+        }
+
+        void MergeKeepingSourceChangesMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.MergeKeepingSourceChanges();
+        }
+
+        void MergeKeepingWorkspaceChangesMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges();
+        }
+
+        void DiffYoursWithIncomingMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.DiffYoursWithIncoming();
+        }
+
+        void DiffIncomingChangesMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.DiffIncomingChanges();
+        }
+
+        void DiffMetaYoursWithIncomingMenuItem_Click()
+        {
+            mIncomingChangesMetaMenuOperations.DiffYoursWithIncoming();
+        }
+
+        void DiffMetaIncomingChangesMenuItem_Click()
+        {
+            mIncomingChangesMetaMenuOperations.DiffIncomingChanges();
+        }
+
+        void UpdateMenuItems(GenericMenu menu)
+        {
+            SelectedIncomingChangesGroupInfo info =
+                mIncomingChangesViewMenuOperations.GetSelectedIncomingChangesGroupInfo();
+            IncomingChangesMenuOperations operations =
+                UpdateIncomingChangesMenu.GetAvailableMenuOperations(info);
+
+            if (operations == IncomingChangesMenuOperations.None)
+            {
+                menu.AddDisabledItem(GetNoActionMenuItemContent());
+                return;
+            }
+
+            AddMergeActions(menu, operations);
+
+            menu.AddSeparator(string.Empty);
+
+            AddDiffActions(menu, operations);
+
+            if (!mIncomingChangesMetaMenuOperations.SelectionHasMeta())
+                return;
+
+            menu.AddSeparator(string.Empty);
+
+            AddMetaActions(menu, operations);
+        }
+
+        void AddMergeActions(
+            GenericMenu menu,
+            IncomingChangesMenuOperations operations)
+        {
+            if (operations.HasFlag(IncomingChangesMenuOperations.MergeContributors))
+                menu.AddItem(mMergeSelectedFilesMenuItemContent, false,
+                    MergeSelectedFilesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mMergeSelectedFilesMenuItemContent);
+
+            if (operations.HasFlag(IncomingChangesMenuOperations.MergeKeepingSourceChanges))
+                menu.AddItem(mMergeKeepingSourceChangesMenuItemContent, false,
+                    MergeKeepingSourceChangesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mMergeKeepingSourceChangesMenuItemContent);
+
+            if (operations.HasFlag(IncomingChangesMenuOperations.MergeKeepingWorkspaceChanges))
+                menu.AddItem(mMergeKeepingWorkspaceChangesMenuItemContent, false,
+                    MergeKeepingWorkspaceChangesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mMergeKeepingWorkspaceChangesMenuItemContent);
+        }
+
+        void AddDiffActions(GenericMenu menu, IncomingChangesMenuOperations operations)
+        {
+            if (operations.HasFlag(IncomingChangesMenuOperations.DiffYoursWithIncoming))
+                menu.AddItem(mDiffYoursWithIncomingMenuItemContent, false,
+                    DiffYoursWithIncomingMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffYoursWithIncomingMenuItemContent);
+
+            if (operations.HasFlag(IncomingChangesMenuOperations.DiffIncomingChanges))
+                menu.AddItem(mDiffIncomingChangesMenuItemContent, false,
+                    DiffIncomingChangesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffIncomingChangesMenuItemContent);
+        }
+
+        void AddMetaActions(GenericMenu menu, IncomingChangesMenuOperations operations)
+        {
+            if (operations.HasFlag(IncomingChangesMenuOperations.DiffYoursWithIncoming))
+                menu.AddItem(mDiffMetaYoursWithIncomingMenuItemContent, false,
+                    DiffMetaYoursWithIncomingMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffMetaYoursWithIncomingMenuItemContent);
+
+            if (operations.HasFlag(IncomingChangesMenuOperations.DiffIncomingChanges))
+                menu.AddItem(mDiffMetaIncomingChangesMenuItemContent, false,
+                    DiffMetaIncomingChangesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffMetaIncomingChangesMenuItemContent);
+        }
+
+        GUIContent GetNoActionMenuItemContent()
+        {
+            if (mNoActionMenuItemContent == null)
+            {
+                mNoActionMenuItemContent = new GUIContent(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.NoActionMenuItem));
+            }
+
+            return mNoActionMenuItemContent;
+        }
+
+        void BuildComponents()
+        {
+            mMergeSelectedFilesMenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.
+                    Name.MergeSelectedFiles));
+            mMergeKeepingSourceChangesMenuItemContent = new GUIContent(
+                UnityMenuItem.EscapedText(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.IncomingChangesMenuItemMergeKeepingSourceChanges)));
+            mMergeKeepingWorkspaceChangesMenuItemContent = new GUIContent(
+                UnityMenuItem.EscapedText(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.IncomingChangesMenuItemMergeKeepingWorkspaceChanges)));
+
+            string diffYoursWithIncomingText = UnityMenuItem.EscapedText(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.IncomingChangesMenuItemDiffYoursWithIncoming));
+
+            string diffIncomingChangesText = UnityMenuItem.EscapedText(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.IncomingChangesMenuItemDiffIncomingChanges));
+
+            mDiffYoursWithIncomingMenuItemContent = new GUIContent(
+                diffYoursWithIncomingText);
+            mDiffIncomingChangesMenuItemContent = new GUIContent(
+                diffIncomingChangesText);
+
+            mDiffMetaYoursWithIncomingMenuItemContent = new GUIContent(
+                string.Format(
+                    "{0}/{1}",
+                    MetaPath.META_EXTENSION,
+                    diffYoursWithIncomingText));
+            mDiffMetaIncomingChangesMenuItemContent = new GUIContent(
+                string.Format(
+                    "{0}/{1}",
+                    MetaPath.META_EXTENSION,
+                    diffIncomingChangesText));
+        }
+
+        GUIContent mNoActionMenuItemContent;
+
+        GUIContent mMergeSelectedFilesMenuItemContent;
+        GUIContent mMergeKeepingSourceChangesMenuItemContent;
+        GUIContent mMergeKeepingWorkspaceChangesMenuItemContent;
+        GUIContent mDiffYoursWithIncomingMenuItemContent;
+        GUIContent mDiffIncomingChangesMenuItemContent;
+        GUIContent mDiffMetaYoursWithIncomingMenuItemContent;
+        GUIContent mDiffMetaIncomingChangesMenuItemContent;
+
+        readonly IIncomingChangesViewMenuOperations mIncomingChangesViewMenuOperations;
+        readonly IMetaMenuOperations mIncomingChangesMetaMenuOperations;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesViewMenu.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesViewMenu.cs.meta
new file mode 100644
index 0000000..19ba8ee
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IncomingChangesViewMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 182343c61d477e2449cfbc9cb20dfb35
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrent.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrent.cs
new file mode 100644
index 0000000..ef4e29c
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrent.cs
@@ -0,0 +1,37 @@
+using Codice.Client.BaseCommands.Merge;
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    // internal for testing purpuses
+    internal static class IsCurrent
+    {
+        internal static bool Conflict(
+            IncomingChangeInfo changeInfo,
+            IncomingChangeInfo metaChangeInfo,
+            MergeSolvedFileConflicts solvedFileConflicts)
+        {
+            if (solvedFileConflicts == null)
+                return false;
+
+            MergeSolvedFileConflicts.CurrentConflict currentConflict;
+
+            if (!solvedFileConflicts.TryGetCurrentConflict(out currentConflict))
+                return false;
+
+            return IsSameConflict(currentConflict, changeInfo) ||
+                   IsSameConflict(currentConflict, metaChangeInfo);
+        }
+
+        static bool IsSameConflict(
+            MergeSolvedFileConflicts.CurrentConflict currentConflict,
+            IncomingChangeInfo changeInfo)
+        {
+            if (changeInfo == null)
+                return false;
+
+            return currentConflict.MountId.Equals(changeInfo.GetMount().Id) &&
+                   currentConflict.ItemId == changeInfo.GetRevision().ItemId;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrent.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrent.cs.meta
new file mode 100644
index 0000000..b972a3a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrent.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5013a6f8fee1f2a49b06f75fc5a6ece4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolved.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolved.cs
new file mode 100644
index 0000000..6e307d3
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolved.cs
@@ -0,0 +1,54 @@
+using Codice.Client.BaseCommands.Merge;
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    internal static class IsSolved
+    {
+        internal static bool Conflict(
+            IncomingChangeInfo changeInfo,
+            IncomingChangeInfo metaChangeInfo,
+            MergeSolvedFileConflicts solvedFileConflicts)
+        {
+            if (IsDirectoryConflict(changeInfo))
+            {
+                if (metaChangeInfo == null)
+                    return IsDirectoryConflictResolved(changeInfo);
+
+                return IsDirectoryConflictResolved(changeInfo) &&
+                       IsDirectoryConflictResolved(metaChangeInfo);
+            }
+
+            if (metaChangeInfo == null)
+            {
+                return IsFileConflictResolved(
+                    changeInfo, solvedFileConflicts);
+            }
+
+            return IsFileConflictResolved(changeInfo, solvedFileConflicts) && 
+                   IsFileConflictResolved(metaChangeInfo, solvedFileConflicts);
+        }
+
+        static bool IsFileConflictResolved(
+            IncomingChangeInfo changeInfo,
+            MergeSolvedFileConflicts solvedFileConflicts)
+        {
+            if (solvedFileConflicts == null)
+                return false;
+
+            return solvedFileConflicts.IsResolved(
+                changeInfo.GetMount().Id,
+                changeInfo.GetRevision().ItemId);
+        }
+
+        static bool IsDirectoryConflictResolved(IncomingChangeInfo changeInfo)
+        {
+            return changeInfo.DirectoryConflict.IsResolved();
+        }
+
+        static bool IsDirectoryConflict(IncomingChangeInfo changeInfo)
+        {
+            return (changeInfo.DirectoryConflict != null);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolved.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolved.cs.meta
new file mode 100644
index 0000000..95a2187
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolved.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d6db53f93de967c489902da57a7290a1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/UnityIncomingChangesTree.cs b/Editor/PlasticSCM/Views/IncomingChanges/Developer/UnityIncomingChangesTree.cs
new file mode 100644
index 0000000..c8acd33
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/UnityIncomingChangesTree.cs
@@ -0,0 +1,182 @@
+using System.Collections.Generic;
+
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer
+{
+    internal class UnityIncomingChangesTree
+    {
+        internal static UnityIncomingChangesTree BuildIncomingChangeCategories(
+            IncomingChangesTree tree)
+        {
+            return new UnityIncomingChangesTree(tree);
+        }
+
+        UnityIncomingChangesTree(
+            IncomingChangesTree tree)
+        {
+            mInnerTree = tree;
+
+            mMetaCache.Build(mInnerTree.GetNodes());
+        }
+
+        internal List<IncomingChangesCategory> GetNodes()
+        {
+            return mInnerTree.GetNodes();
+        }
+
+        internal bool HasMeta(IncomingChangeInfo changeInfo)
+        {
+            return mMetaCache.ContainsMeta(changeInfo);
+        }
+
+        internal IncomingChangeInfo GetMetaChange(IncomingChangeInfo change)
+        {
+            return mMetaCache.GetExistingMeta(change);
+        }
+
+        internal void FillWithMeta(List<IncomingChangeInfo> changes)
+        {
+            changes.AddRange(
+                mMetaCache.GetExistingMeta(changes));
+        }
+
+        internal void Sort(string key, bool isAscending)
+        {
+            mInnerTree.Sort(key, isAscending);
+        }
+
+        internal void ResolveUserNames(
+            IncomingChangesTree.ResolveUserName resolveUserName)
+        {
+            mInnerTree.ResolveUserNames(resolveUserName);
+        }
+
+        MetaCache mMetaCache = new MetaCache();
+        IncomingChangesTree mInnerTree;
+
+        class MetaCache
+        {
+            internal bool ContainsMeta(IncomingChangeInfo changeInfo)
+            {
+                string key = BuildKey.ForMetaChange(changeInfo);
+
+                return mCache.ContainsKey(key);
+            }
+
+            internal IncomingChangeInfo GetExistingMeta(IncomingChangeInfo change)
+            {
+                IncomingChangeInfo result;
+
+                if (!mCache.TryGetValue(BuildKey.ForMetaChange(change), out result))
+                    return null;
+
+                return result;
+            }
+
+            internal List<IncomingChangeInfo> GetExistingMeta(
+                List<IncomingChangeInfo> changes)
+            {
+                List<IncomingChangeInfo> result = new List<IncomingChangeInfo>();
+
+                foreach (IncomingChangeInfo change in changes)
+                {
+                    string key = BuildKey.ForMetaChange(change);
+
+                    IncomingChangeInfo metaChange;
+                    if (!mCache.TryGetValue(key, out metaChange))
+                        continue;
+
+                    result.Add(metaChange);
+                }
+
+                return result;
+            }
+
+            internal void Build(List<IncomingChangesCategory> incomingChangesCategories)
+            {
+                mCache.Clear();
+
+                foreach (IncomingChangesCategory category in incomingChangesCategories)
+                {
+                    ExtractMetaToCache(category, mCache);
+                }
+            }
+
+            static void ExtractMetaToCache(
+                IncomingChangesCategory category,
+                Dictionary<string, IncomingChangeInfo> cache)
+            {
+                List<IncomingChangeInfo> changes = category.GetChanges();
+
+                HashSet<string> indexedKeys = BuildIndexedKeys(
+                    changes);
+
+                for (int i = changes.Count - 1; i >= 0; i--)
+                {
+                    IncomingChangeInfo currentChange = changes[i];
+
+                    string path = currentChange.GetPath();
+
+                    if (!MetaPath.IsMetaPath(path))
+                        continue;
+
+                    string realPath = MetaPath.GetPathFromMetaPath(path);
+
+                    if (!indexedKeys.Contains(BuildKey.BuildCacheKey(
+                        currentChange.CategoryType, realPath)))
+                        continue;
+
+                    // found foo.c and foo.c.meta - move .meta to cache
+                    cache.Add(BuildKey.ForChange(currentChange), currentChange);
+                    changes.RemoveAt(i);
+                }
+            }
+
+            static HashSet<string> BuildIndexedKeys(
+                List<IncomingChangeInfo> changes)
+            {
+                HashSet<string> result = new HashSet<string>();
+
+                foreach (IncomingChangeInfo change in changes)
+                {
+                    if (MetaPath.IsMetaPath(change.GetPath()))
+                        continue;
+
+                    result.Add(BuildKey.ForChange(change));
+                }
+
+                return result;
+            }
+
+            Dictionary<string, IncomingChangeInfo> mCache =
+                new Dictionary<string, IncomingChangeInfo>();
+
+            static class BuildKey
+            {
+                internal static string ForChange(
+                    IncomingChangeInfo change)
+                {
+                    return BuildCacheKey(
+                        change.CategoryType,
+                        change.GetPath());
+                }
+
+                internal static string ForMetaChange(
+                    IncomingChangeInfo change)
+                {
+                    return BuildCacheKey(
+                        change.CategoryType,
+                        MetaPath.GetMetaPath(change.GetPath()));
+                }
+
+                internal static string BuildCacheKey(
+                    IncomingChangesCategory.Type type,
+                    string path)
+                {
+                    return string.Concat(type, ":", path);
+                }
+            }
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Developer/UnityIncomingChangesTree.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Developer/UnityIncomingChangesTree.cs.meta
new file mode 100644
index 0000000..929b38c
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Developer/UnityIncomingChangesTree.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b57672168ae882a4b8483a000638c433
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon.meta
new file mode 100644
index 0000000..8fb6d60
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 184012b39edc5c7468c23f916818433e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeCategoryTreeViewItem.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeCategoryTreeViewItem.cs
new file mode 100644
index 0000000..1d444df
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeCategoryTreeViewItem.cs
@@ -0,0 +1,17 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon
+{
+    internal class ChangeCategoryTreeViewItem : TreeViewItem
+    {
+        internal IncomingChangeCategory Category { get; private set; }
+
+        internal ChangeCategoryTreeViewItem(int id, IncomingChangeCategory category)
+            : base(id, 0)
+        {
+            Category = category;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeCategoryTreeViewItem.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeCategoryTreeViewItem.cs.meta
new file mode 100644
index 0000000..2f8c827
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeCategoryTreeViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: faf2afd8696f4604f82f46b06b357f06
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeTreeViewItem.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeTreeViewItem.cs
new file mode 100644
index 0000000..4b4c073
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeTreeViewItem.cs
@@ -0,0 +1,19 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon
+{
+    internal class ChangeTreeViewItem : TreeViewItem
+    {
+        internal IncomingChangeInfo ChangeInfo { get; private set; }
+
+        internal ChangeTreeViewItem(int id, IncomingChangeInfo change)
+            : base(id, 1)
+        {
+            ChangeInfo = change;
+
+            displayName = change.GetPathString();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeTreeViewItem.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeTreeViewItem.cs.meta
new file mode 100644
index 0000000..1ef5efb
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/ChangeTreeViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d491adc3134c2ac4d9e3c61ed42a7ccd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors.meta
new file mode 100644
index 0000000..a114dff
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4edf5537f8245134c8b023ab85d8e640
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorListViewItem.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorListViewItem.cs
new file mode 100644
index 0000000..b6266ae
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorListViewItem.cs
@@ -0,0 +1,19 @@
+using UnityEditor.IMGUI.Controls;
+
+using Codice.Client.BaseCommands;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon.Errors
+{
+    internal class ErrorListViewItem : TreeViewItem
+    {
+        internal ErrorMessage ErrorMessage { get; private set; }
+
+        internal ErrorListViewItem(int id, ErrorMessage errorMessage)
+            : base(id, 0)
+        {
+            ErrorMessage = errorMessage;
+
+            displayName = errorMessage.Path;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorListViewItem.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorListViewItem.cs.meta
new file mode 100644
index 0000000..6115d83
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorListViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 71c34e5fa319ca644b6806e573c33d88
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListHeaderState.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListHeaderState.cs
new file mode 100644
index 0000000..e62a453
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListHeaderState.cs
@@ -0,0 +1,91 @@
+using System;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon.Errors
+{
+    internal enum ErrorsListColumn
+    {
+        Path,
+        Reason
+    }
+
+    [Serializable]
+    internal class ErrorsListHeaderState : MultiColumnHeaderState, ISerializationCallbackReceiver
+    {
+        internal static ErrorsListHeaderState GetDefault()
+        {
+            return new ErrorsListHeaderState(BuildColumns());
+        }
+
+        static string GetColumnName(ErrorsListColumn column)
+        {
+            switch (column)
+            {
+                case ErrorsListColumn.Path:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn);
+                case ErrorsListColumn.Reason:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.Reason);
+                default:
+                    return null;
+            }
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            if (mHeaderTitles != null)
+                TreeHeaderColumns.SetTitles(columns, mHeaderTitles);
+
+            if (mColumsAllowedToggleVisibility != null)
+                TreeHeaderColumns.SetVisibilities(columns, mColumsAllowedToggleVisibility);
+        }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+        }
+
+        static Column[] BuildColumns()
+        {
+            return new Column[]
+                {
+                    new Column()
+                    {
+                        width = 300,
+                        headerContent = new GUIContent(
+                            GetColumnName(ErrorsListColumn.Path)),
+                        minWidth = 200,
+                        allowToggleVisibility = false,
+                        canSort = false
+                    },
+                    new Column()
+                    {
+                        width = 600,
+                        headerContent = new GUIContent(
+                            GetColumnName(ErrorsListColumn.Reason)),
+                        minWidth = 200,
+                        canSort = false
+                    }
+                };
+        }
+
+        ErrorsListHeaderState(Column[] columns)
+            : base(columns)
+        {
+            if (mHeaderTitles == null)
+                mHeaderTitles = TreeHeaderColumns.GetTitles(columns);
+
+            if (mColumsAllowedToggleVisibility == null)
+                mColumsAllowedToggleVisibility = TreeHeaderColumns.GetVisibilities(columns);
+        }
+
+        [SerializeField]
+        string[] mHeaderTitles;
+
+        [SerializeField]
+        bool[] mColumsAllowedToggleVisibility;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListHeaderState.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListHeaderState.cs.meta
new file mode 100644
index 0000000..e6fea23
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListHeaderState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8c069d7fb0d30cf499458f0d9c9fe035
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListView.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListView.cs
new file mode 100644
index 0000000..83f6b7d
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListView.cs
@@ -0,0 +1,163 @@
+using System.Collections.Generic;
+
+using UnityEngine;
+using UnityEditor.IMGUI.Controls;
+
+using Codice.Client.BaseCommands;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon.Errors
+{
+    internal class ErrorsListView : TreeView
+    {
+        internal ErrorsListView(ErrorsListHeaderState headerState)
+            : base(new TreeViewState())
+        {
+            multiColumnHeader = new MultiColumnHeader(headerState);
+            multiColumnHeader.canSort = false;
+
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem rootItem)
+        {
+            RegenerateRows(
+                this, mErrorMessages, rootItem, mRows);
+
+            return mRows;
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            if (args.item is ErrorListViewItem)
+            {
+                ErrorListViewItemGUI((ErrorListViewItem)args.item, args);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        internal void BuildModel(List<ErrorMessage> errorMessages)
+        {
+            mErrorMessages = errorMessages;
+        }
+
+        internal ErrorMessage GetSelectedError()
+        {
+            List<ErrorMessage> selectedErrors = GetSelectedErrors(this);
+
+            if (selectedErrors.Count != 1)
+                return null;
+
+            return selectedErrors[0];
+        }
+
+        static List<ErrorMessage> GetSelectedErrors(
+            ErrorsListView listView)
+        {
+            List<ErrorMessage> result = new List<ErrorMessage>();
+
+            IList<int> selectedIds = listView.GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (ErrorListViewItem treeViewItem in
+                listView.FindRows(selectedIds))
+            {
+                result.Add(treeViewItem.ErrorMessage);
+            }
+
+            return result;
+        }
+
+        static void RegenerateRows(
+            ErrorsListView listView,
+            List<ErrorMessage> errorMessages,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            ClearRows(rootItem, rows);
+
+            if (errorMessages.Count == 0)
+                return;
+
+            for (int i = 0; i < errorMessages.Count; i++)
+            {
+                ErrorListViewItem errorListViewItem =
+                    new ErrorListViewItem(i + 1, errorMessages[i]);
+
+                rootItem.AddChild(errorListViewItem);
+                rows.Add(errorListViewItem);
+            }
+
+            listView.SetSelection(new List<int> { 1 });
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static void ErrorListViewItemGUI(
+            ErrorListViewItem item,
+            RowGUIArgs args)
+        {
+            for (int visibleColumnIdx = 0; visibleColumnIdx < args.GetNumVisibleColumns(); visibleColumnIdx++)
+            {
+                Rect cellRect = args.GetCellRect(visibleColumnIdx);
+
+                ErrorsListColumn column =
+                    (ErrorsListColumn)args.GetColumn(visibleColumnIdx);
+
+                ErrorListViewItemCellGUI(
+                    cellRect, item, column, args.selected, args.focused);
+            }
+        }
+
+        static void ErrorListViewItemCellGUI(
+            Rect rect,
+            ErrorListViewItem item,
+            ErrorsListColumn column,
+            bool isSelected,
+            bool isFocused)
+        {
+            ErrorMessage errorMessage = item.ErrorMessage;
+
+            string label = column == ErrorsListColumn.Path ?
+                errorMessage.Path : errorMessage.Error;
+
+            if (column == ErrorsListColumn.Path)
+            {
+                DrawTreeViewItem.ForLabel(
+                    rect, label, isSelected, isFocused, false);
+                return;
+            }
+
+            DrawTreeViewItem.ForSecondaryLabel(
+                rect, label, isSelected, isFocused, false);
+        }
+
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        List<ErrorMessage> mErrorMessages = new List<ErrorMessage>();
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListView.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListView.cs.meta
new file mode 100644
index 0000000..9752703
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/Errors/ErrorsListView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 331d1c37d891f334390adb8324042856
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesSelection.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesSelection.cs
new file mode 100644
index 0000000..3a14160
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesSelection.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+
+using PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon
+{
+    internal static class IncomingChangesSelection
+    {
+        internal static SelectedIncomingChangesGroupInfo GetSelectedGroupInfo(
+            IncomingChangesTreeView treeView)
+        {
+            List<IncomingChangeInfo> selectedIncomingChanges =
+                treeView.GetSelectedIncomingChanges();
+
+            return GetSelectedIncomingChangesGroupInfo.For(
+                selectedIncomingChanges);
+        }
+
+        internal static List<IncomingChangeInfo> GetSelectedFileConflictsIncludingMeta(
+            IncomingChangesTreeView treeView)
+        {
+            List<IncomingChangeInfo> result = treeView.GetSelectedFileConflicts();
+            treeView.FillWithMeta(result);
+            return result;
+        }
+
+        internal static IncomingChangeInfo GetSingleSelectedIncomingChange(
+            IncomingChangesTreeView treeView)
+        {
+            return treeView.GetSelectedIncomingChange();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesSelection.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesSelection.cs.meta
new file mode 100644
index 0000000..dda9d5b
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesSelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d287890d8b11cb7498506935c825b43d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTab.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTab.cs
new file mode 100644
index 0000000..b9bf13e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTab.cs
@@ -0,0 +1,703 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using Codice.Client.Common.FsNodeReaders;
+using Codice.CM.Common;
+using GluonGui;
+using PlasticGui;
+using PlasticGui.Gluon.WorkspaceWindow;
+using PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges;
+using PlasticGui.WorkspaceWindow.Diff;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.UI.Tree;
+using Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon.Errors;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon
+{
+    internal class IncomingChangesTab :
+        IIncomingChangesTab,
+        IRefreshableView,
+        IncomingChangesViewLogic.IIncomingChangesView,
+        IIncomingChangesViewMenuOperations,
+        IncomingChangesViewMenu.IMetaMenuOperations
+    {
+        internal IncomingChangesTab(
+            WorkspaceInfo wkInfo,
+            ViewHost viewHost,
+            PlasticGUIClient plasticClient,
+            NewIncomingChangesUpdater newIncomingChangesUpdater,
+            CheckIncomingChanges.IUpdateIncomingChanges updateIncomingChanges,
+            EditorWindow parentWindow)
+        {
+            mWkInfo = wkInfo;
+            mPlasticClient = plasticClient;
+            mNewIncomingChangesUpdater = newIncomingChangesUpdater;
+            mParentWindow = parentWindow;
+
+            BuildComponents();
+
+            mProgressControls = new ProgressControlsForViews();
+
+            mErrorsSplitterState = PlasticSplitterGUILayout.InitSplitterState(
+                new float[] { 0.75f, 0.25f },
+                new int[] { 100, 100 },
+                new int[] { 100000, 100000 }
+            );
+
+            mErrorDetailsSplitterState = PlasticSplitterGUILayout.InitSplitterState(
+                new float[] { 0.60f, 0.40f },
+                new int[] { 100, 100 },
+                new int[] { 100000, 100000 }
+            );
+
+            mIncomingChangesViewLogic = new IncomingChangesViewLogic(
+                wkInfo, viewHost, this, new UnityPlasticGuiMessage(parentWindow),
+                mProgressControls, updateIncomingChanges,
+                plasticClient.GluonProgressOperationHandler, plasticClient,
+                new IncomingChangesViewLogic.ApplyWorkspaceLocalChanges(),
+                new IncomingChangesViewLogic.OutOfDateItemsOperations(),
+                new IncomingChangesViewLogic.ResolveUserName(),
+                new IncomingChangesViewLogic.GetWorkingBranch(),
+                NewChangesInWk.Build(wkInfo, new BuildWorkspacekIsRelevantNewChange()),
+                null);
+
+            mIncomingChangesViewLogic.Refresh();
+        }
+
+        bool IIncomingChangesTab.IsVisible
+        {
+            get { return mIsVisible; }
+            set { mIsVisible = value ; }
+        }
+
+        void IIncomingChangesTab.OnDisable()
+        {
+            TreeHeaderSettings.Save(
+                mIncomingChangesTreeView.multiColumnHeader.state,
+                UnityConstants.GLUON_INCOMING_CHANGES_TABLE_SETTINGS_NAME);
+
+            TreeHeaderSettings.Save(
+                mErrorsListView.multiColumnHeader.state,
+                UnityConstants.GLUON_INCOMING_ERRORS_TABLE_SETTINGS_NAME);
+        }
+
+        void IIncomingChangesTab.Update()
+        {
+            mProgressControls.UpdateProgress(mParentWindow);
+        }
+
+        void IIncomingChangesTab.OnGUI()
+        {
+            DoActionsToolbar(
+                mIsProcessMergesButtonVisible,
+                mIsCancelMergesButtonVisible,
+                mIsProcessMergesButtonEnabled,
+                mIsCancelMergesButtonEnabled,
+                mProcessMergesButtonText,
+                mIncomingChangesViewLogic,
+                mIncomingChangesTreeView,
+                mProgressControls);
+
+            bool splitterNeeded = mIsErrorsListVisible;
+
+            if (splitterNeeded)
+                PlasticSplitterGUILayout.BeginVerticalSplit(mErrorsSplitterState);
+
+            DoIncomingChangesArea(
+                mPlasticClient,
+                mIncomingChangesTreeView,
+                mPendingConflictsLabelData,
+                mChangesToApplySummaryLabelText,
+                mMessageLabelText,
+                mIsMessageLabelVisible,
+                mProgressControls.IsOperationRunning());
+
+            DoErrorsArea(
+                mErrorsListView,
+                mErrorDetailsSplitterState,
+                mErrorMessageLabelText,
+                mIsErrorsListVisible,
+                mIsErrorMessageLabelVisible);
+
+            if (splitterNeeded)
+                PlasticSplitterGUILayout.EndVerticalSplit();
+
+            if (mProgressControls.HasNotification())
+            {
+                DrawProgressForViews.ForNotificationArea(
+                    mProgressControls.ProgressData);
+            }
+        }
+
+        void IIncomingChangesTab.AutoRefresh()
+        {
+            mIncomingChangesViewLogic.AutoRefresh(DateTime.Now);
+        }
+
+        void IRefreshableView.Refresh()
+        {
+            if (mNewIncomingChangesUpdater != null)
+                mNewIncomingChangesUpdater.Update(DateTime.Now);
+
+            mIncomingChangesViewLogic.Refresh();
+        }
+
+        void IncomingChangesViewLogic.IIncomingChangesView.UpdateData(
+            IncomingChangesTree tree,
+            List<ErrorMessage> errorMessages,
+            string processMergesButtonText,
+            PendingConflictsLabelData conflictsLabelData,
+            string changesToApplySummaryText)
+        {
+            ShowProcessMergesButton(processMergesButtonText);
+
+            ((IncomingChangesViewLogic.IIncomingChangesView)this).
+                UpdatePendingConflictsLabel(conflictsLabelData);
+
+            mChangesToApplySummaryLabelText = changesToApplySummaryText;
+
+            UpdateIncomingChangesTree(mIncomingChangesTreeView, tree);
+
+            UpdateErrorsList(mErrorsListView, errorMessages);
+
+            mIsErrorsListVisible = errorMessages.Count > 0;
+        }
+
+        void IncomingChangesViewLogic.IIncomingChangesView.UpdatePendingConflictsLabel(
+            PendingConflictsLabelData data)
+        {
+            mPendingConflictsLabelData = data;
+        }
+
+        void IncomingChangesViewLogic.IIncomingChangesView.UpdateSolvedFileConflicts(
+            List<IncomingChangeInfo> solvedConflicts,
+            IncomingChangeInfo currentConflict)
+        {
+            mIncomingChangesTreeView.UpdateSolvedFileConflicts(
+                solvedConflicts, currentConflict);
+        }
+
+        void IncomingChangesViewLogic.IIncomingChangesView.ShowMessage(
+            string message, bool isErrorMessage)
+        {
+            if (isErrorMessage)
+            {
+                mErrorMessageLabelText = message;
+                mIsErrorMessageLabelVisible = true;
+                return;
+            }
+
+            mMessageLabelText = message;
+            mIsMessageLabelVisible = true;
+        }
+
+        void IncomingChangesViewLogic.IIncomingChangesView.HideMessage()
+        {
+            mMessageLabelText = string.Empty;
+            mIsMessageLabelVisible = false;
+
+            mErrorMessageLabelText = string.Empty;
+            mIsErrorMessageLabelVisible = false;
+        }
+
+        void IncomingChangesViewLogic.IIncomingChangesView.DisableProcessMergesButton()
+        {
+            mIsProcessMergesButtonEnabled = false;
+        }
+
+        void IncomingChangesViewLogic.IIncomingChangesView.ShowCancelButton()
+        {
+            mIsCancelMergesButtonEnabled = true;
+            mIsCancelMergesButtonVisible = true;
+        }
+
+        void IncomingChangesViewLogic.IIncomingChangesView.HideCancelButton()
+        {
+            mIsCancelMergesButtonEnabled = false;
+            mIsCancelMergesButtonVisible = false;
+        }
+
+        SelectedIncomingChangesGroupInfo IIncomingChangesViewMenuOperations.GetSelectedIncomingChangesGroupInfo()
+        {
+            return IncomingChangesSelection.GetSelectedGroupInfo(mIncomingChangesTreeView);
+        }
+
+        void IIncomingChangesViewMenuOperations.MergeContributors()
+        {
+            List<IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
+                GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);
+
+            mIncomingChangesViewLogic.ProcessMergesForConflicts(
+                MergeContributorType.MergeContributors,
+                fileConflicts,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        void IIncomingChangesViewMenuOperations.MergeKeepingSourceChanges()
+        {
+            List<IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
+                GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);
+
+            mIncomingChangesViewLogic.ProcessMergesForConflicts(
+                MergeContributorType.KeepSource,
+                fileConflicts,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        void IIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges()
+        {
+            List<IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
+                GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);
+
+            mIncomingChangesViewLogic.ProcessMergesForConflicts(
+                MergeContributorType.KeepDestination,
+                fileConflicts,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        void IIncomingChangesViewMenuOperations.DiffIncomingChanges()
+        {
+            IncomingChangeInfo incomingChange = IncomingChangesSelection.
+                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
+
+            if (incomingChange == null)
+                return;
+
+            DiffIncomingChanges(
+                incomingChange,
+                mWkInfo);
+        }
+
+        void IIncomingChangesViewMenuOperations.DiffYoursWithIncoming()
+        {
+            IncomingChangeInfo incomingChange = IncomingChangesSelection.
+                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
+
+            if (incomingChange == null)
+                return;
+
+            DiffYoursWithIncoming(
+                incomingChange,
+                mWkInfo);
+        }
+
+        void IncomingChangesViewMenu.IMetaMenuOperations.DiffIncomingChanges()
+        {
+            IncomingChangeInfo incomingChange = IncomingChangesSelection.
+                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
+
+            if (incomingChange == null)
+                return;
+
+            DiffIncomingChanges(
+                mIncomingChangesTreeView.GetMetaChange(incomingChange),
+                mWkInfo);
+        }
+
+        void IncomingChangesViewMenu.IMetaMenuOperations.DiffYoursWithIncoming()
+        {
+            IncomingChangeInfo incomingChange = IncomingChangesSelection.
+                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
+
+            if (incomingChange == null)
+                return;
+
+            DiffYoursWithIncoming(
+                mIncomingChangesTreeView.GetMetaChange(incomingChange),
+                mWkInfo);
+        }
+
+        bool IncomingChangesViewMenu.IMetaMenuOperations.SelectionHasMeta()
+        {
+            return mIncomingChangesTreeView.SelectionHasMeta();
+        }
+
+        static void DiffIncomingChanges(
+            IncomingChangeInfo incomingChange,
+            WorkspaceInfo wkInfo)
+        {
+            DiffOperation.DiffRevisions(
+                wkInfo,
+                incomingChange.GetMount().RepSpec,
+                incomingChange.GetBaseRevision(),
+                incomingChange.GetRevision(),
+                incomingChange.GetPath(),
+                incomingChange.GetPath(),
+                true,
+                xDiffLauncher: null,
+                imageDiffLauncher: null);
+        }
+
+        static void DiffYoursWithIncoming(
+            IncomingChangeInfo incomingChange,
+            WorkspaceInfo wkInfo)
+        {
+            DiffOperation.DiffYoursWithIncoming(
+                wkInfo,
+                incomingChange.GetMount(),
+                incomingChange.GetRevision(),
+                incomingChange.GetPath(),
+                xDiffLauncher: null,
+                imageDiffLauncher: null);
+        }
+
+        static void UpdateErrorsList(
+            ErrorsListView errorsListView,
+            List<ErrorMessage> errorMessages)
+        {
+            errorsListView.BuildModel(errorMessages);
+
+            errorsListView.Reload();
+        }
+
+        void UpdateProcessMergesButtonText()
+        {
+            mProcessMergesButtonText =
+                mIncomingChangesViewLogic.GetProcessMergesButtonText();
+        }
+
+        void ShowProcessMergesButton(string processMergesButtonText)
+        {
+            mProcessMergesButtonText = processMergesButtonText;
+            mIsProcessMergesButtonEnabled = true;
+            mIsProcessMergesButtonVisible = true;
+        }
+
+        void DoActionsToolbar(
+            bool isProcessMergesButtonVisible,
+            bool isCancelMergesButtonVisible,
+            bool isProcessMergesButtonEnabled,
+            bool isCancelMergesButtonEnabled,
+            string processMergesButtonText,
+            IncomingChangesViewLogic incomingChangesViewLogic,
+            IncomingChangesTreeView incomingChangesTreeView,
+            ProgressControlsForViews progressControls)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            if (isProcessMergesButtonVisible)
+            {
+                DoProcessMergesButton(
+                    isProcessMergesButtonEnabled,
+                    processMergesButtonText,
+                    incomingChangesViewLogic,
+                    incomingChangesTreeView);
+            }
+
+            if (isCancelMergesButtonVisible)
+            {
+                DoCancelMergesButton(
+                    isCancelMergesButtonEnabled,
+                    incomingChangesViewLogic);
+            }
+
+            if (progressControls.IsOperationRunning())
+            {
+                DrawProgressForViews.ForIndeterminateProgress(
+                    progressControls.ProgressData);
+            }
+
+            GUILayout.FlexibleSpace();
+
+            DoRefreshButton(
+                !progressControls.IsOperationRunning(),
+                incomingChangesViewLogic);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoIncomingChangesArea(
+            PlasticGUIClient plasticClient,
+            IncomingChangesTreeView incomingChangesTreeView,
+            PendingConflictsLabelData pendingConflictsLabelData,
+            string changesToApplySummaryLabelText,
+            string messageLabelText,
+            bool isMessageLabelVisible,
+            bool isOperationRunning)
+        {
+            EditorGUILayout.BeginVertical();
+
+            DoPendingConflictsAndChangesToApplyLabel(
+                pendingConflictsLabelData,
+                changesToApplySummaryLabelText);
+
+            DoIncomingChangesTreeViewArea(
+                incomingChangesTreeView,
+                isOperationRunning);
+
+            if (isMessageLabelVisible)
+                DoInfoMessageArea(messageLabelText);
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static void DoProcessMergesButton(
+            bool isEnabled,
+            string processMergesButtonText,
+            IncomingChangesViewLogic incomingChangesViewLogic,
+            IncomingChangesTreeView incomingChangesTreeView)
+        {
+            GUI.enabled = isEnabled;
+
+            if (DrawActionButton.For(processMergesButtonText))
+            {
+                List<IncomingChangeInfo> incomingChanges =
+                    incomingChangesViewLogic.GetCheckedChanges();
+
+                incomingChangesTreeView.FillWithMeta(incomingChanges);
+
+                if (incomingChanges.Count == 0)
+                    return;
+
+                incomingChangesViewLogic.ProcessMergesForItems(
+                    incomingChanges,
+                    RefreshAsset.UnityAssetDatabase);
+            }
+
+            GUI.enabled = true;
+        }
+
+        void DoCancelMergesButton(
+            bool isEnabled,
+            IncomingChangesViewLogic incomingChangesViewLogic)
+        {
+            GUI.enabled = isEnabled;
+
+            if (DrawActionButton.For(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+            {
+                incomingChangesViewLogic.Cancel();
+
+                mIsCancelMergesButtonEnabled = false;
+            }
+
+            GUI.enabled = true;
+        }
+
+        void DoErrorsArea(
+            ErrorsListView errorsListView,
+            object splitterState,
+            string errorMessageLabelText,
+            bool isErrorsListVisible,
+            bool isErrorMessageLabelVisible)
+        {
+            EditorGUILayout.BeginVertical();
+
+            if (isErrorsListVisible)
+            {
+                DrawSplitter.ForHorizontalIndicator();
+                DoErrorsListArea(errorsListView, splitterState);
+            }
+
+            if (isErrorMessageLabelVisible)
+                DoErrorMessageArea(errorMessageLabelText);
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static void DoPendingConflictsAndChangesToApplyLabel(
+            PendingConflictsLabelData pendingConflictsLabelData,
+            string changesToApplySummaryLabelText)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            GUIStyle pendingConflictsOfTotalStyle =
+                pendingConflictsLabelData.HasPendingConflicts ?
+                UnityStyles.IncomingChangesTab.RedPendingConflictsOfTotalLabel :
+                UnityStyles.IncomingChangesTab.GreenPendingConflictsOfTotalLabel;
+
+            GUILayout.Label(
+                pendingConflictsLabelData.PendingConflictsOfTotalText,
+                pendingConflictsOfTotalStyle);
+
+            GUILayout.Label(
+                pendingConflictsLabelData.PendingConflictsLabelText,
+                UnityStyles.IncomingChangesTab.PendingConflictsLabel);
+
+            GUILayout.Space(5);
+
+            GUILayout.Label(
+                changesToApplySummaryLabelText,
+                UnityStyles.IncomingChangesTab.ChangesToApplySummaryLabel);
+
+            GUILayout.FlexibleSpace();
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void UpdateIncomingChangesTree(
+            IncomingChangesTreeView incomingChangesTreeView,
+            IncomingChangesTree tree)
+        {
+            incomingChangesTreeView.BuildModel(
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(tree));
+            incomingChangesTreeView.Sort();
+            incomingChangesTreeView.Reload();
+        }
+
+        static void DoIncomingChangesTreeViewArea(
+            IncomingChangesTreeView incomingChangesTreeView,
+            bool isOperationRunning)
+        {
+            GUI.enabled = !isOperationRunning;
+
+            Rect rect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            incomingChangesTreeView.OnGUI(rect);
+
+            GUI.enabled = true;
+        }
+
+        void DoErrorsListArea(
+            ErrorsListView errorsListView,
+            object splitterState)
+        {
+            EditorGUILayout.BeginVertical();
+
+            GUILayout.Label(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.IncomingChangesCannotBeApplied),
+                EditorStyles.boldLabel);
+
+            DoErrorsListSplitViewArea(
+                errorsListView, splitterState);
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static void DoErrorMessageArea(string message)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            EditorGUILayout.HelpBox(message, MessageType.Error);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void DoErrorsListSplitViewArea(
+            ErrorsListView errorsListView,
+            object splitterState)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            PlasticSplitterGUILayout.BeginHorizontalSplit(splitterState);
+
+            DoErrorsListViewArea(errorsListView);
+
+            DoErrorDetailsTextArea(errorsListView.GetSelectedError());
+
+            PlasticSplitterGUILayout.EndHorizontalSplit();
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoErrorsListViewArea(
+            ErrorsListView errorsListView)
+        {
+            Rect treeRect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            errorsListView.OnGUI(treeRect);
+        }
+
+        void DoErrorDetailsTextArea(ErrorMessage selectedErrorMessage)
+        {
+            string errorDetailsText = selectedErrorMessage == null ?
+                string.Empty : selectedErrorMessage.Error;
+
+            mErrorDetailsScrollPosition = GUILayout.BeginScrollView(
+                mErrorDetailsScrollPosition);
+
+            GUILayout.TextArea(
+                errorDetailsText, UnityStyles.TextFieldWithWrapping,
+                GUILayout.ExpandHeight(true));
+
+            GUILayout.EndScrollView();
+        }
+
+        static void DoRefreshButton(
+            bool isEnabled,
+            IncomingChangesViewLogic incomingChangesViewLogic)
+        {
+            GUI.enabled = isEnabled;
+
+            if (GUILayout.Button(new GUIContent(
+                    Images.GetRefreshIcon()), EditorStyles.toolbarButton))
+                incomingChangesViewLogic.Refresh();
+
+            GUI.enabled = true;
+        }
+
+        static void DoInfoMessageArea(string message)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            EditorGUILayout.HelpBox(message, MessageType.Info);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void BuildComponents()
+        {
+            IncomingChangesTreeHeaderState incomingChangesHeaderState =
+                IncomingChangesTreeHeaderState.GetDefault();
+            TreeHeaderSettings.Load(incomingChangesHeaderState,
+                UnityConstants.GLUON_INCOMING_CHANGES_TABLE_SETTINGS_NAME,
+                (int)IncomingChangesTreeColumn.Path, true);
+
+            mIncomingChangesTreeView = new IncomingChangesTreeView(
+                mWkInfo, incomingChangesHeaderState,
+                IncomingChangesTreeHeaderState.GetColumnNames(),
+                new IncomingChangesViewMenu(this, this),
+                UpdateProcessMergesButtonText);
+            mIncomingChangesTreeView.Reload();
+
+            ErrorsListHeaderState errorsListHeaderState =
+                ErrorsListHeaderState.GetDefault();
+            TreeHeaderSettings.Load(errorsListHeaderState,
+                UnityConstants.GLUON_INCOMING_ERRORS_TABLE_SETTINGS_NAME,
+                UnityConstants.UNSORT_COLUMN_ID);
+
+            mErrorsListView = new ErrorsListView(errorsListHeaderState);
+            mErrorsListView.Reload();
+        }
+
+        bool mIsVisible;
+        bool mIsProcessMergesButtonVisible;
+        bool mIsCancelMergesButtonVisible;
+        bool mIsMessageLabelVisible;
+        bool mIsErrorMessageLabelVisible;
+        bool mIsErrorsListVisible;
+
+        bool mIsProcessMergesButtonEnabled;
+        bool mIsCancelMergesButtonEnabled;
+
+        string mProcessMergesButtonText;
+        string mMessageLabelText;
+        string mErrorMessageLabelText;
+
+        PendingConflictsLabelData mPendingConflictsLabelData;
+        string mChangesToApplySummaryLabelText;
+
+        IncomingChangesTreeView mIncomingChangesTreeView;
+        ErrorsListView mErrorsListView;
+
+        object mErrorsSplitterState;
+        object mErrorDetailsSplitterState;
+
+        readonly ProgressControlsForViews mProgressControls;
+        Vector2 mErrorDetailsScrollPosition;
+
+        readonly IncomingChangesViewLogic mIncomingChangesViewLogic;
+        readonly EditorWindow mParentWindow;
+        readonly NewIncomingChangesUpdater mNewIncomingChangesUpdater;
+        readonly PlasticGUIClient mPlasticClient;
+        readonly WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTab.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTab.cs.meta
new file mode 100644
index 0000000..200df6e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTab.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9b917d42ad338ab4494088f574472998
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeHeaderState.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeHeaderState.cs
new file mode 100644
index 0000000..bc19c05
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeHeaderState.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon
+{
+    internal enum IncomingChangesTreeColumn
+    {
+        Path,
+        LastEditedBy,
+        Size,
+        DateModififed
+    }
+
+    [Serializable]
+    internal class IncomingChangesTreeHeaderState : MultiColumnHeaderState, ISerializationCallbackReceiver
+    {
+        internal static IncomingChangesTreeHeaderState GetDefault()
+        {
+            return new IncomingChangesTreeHeaderState(BuildColumns());
+        }
+
+        internal static List<string> GetColumnNames()
+        {
+            List<string> result = new List<string>();
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.LastEditedByColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.SizeColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.DateModifiedColumn));
+            return result;
+        }
+
+        internal static string GetColumnName(IncomingChangesTreeColumn column)
+        {
+            switch (column)
+            {
+                case IncomingChangesTreeColumn.Path:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.PathColumn);
+                case IncomingChangesTreeColumn.LastEditedBy:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.LastEditedByColumn);
+                case IncomingChangesTreeColumn.Size:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.SizeColumn);
+                case IncomingChangesTreeColumn.DateModififed:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.DateModifiedColumn);
+                default:
+                    return null;
+            }
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            if (mHeaderTitles != null)
+                TreeHeaderColumns.SetTitles(columns, mHeaderTitles);
+
+            if (mColumsAllowedToggleVisibility != null)
+                TreeHeaderColumns.SetVisibilities(columns, mColumsAllowedToggleVisibility);
+        }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+        }
+
+        static Column[] BuildColumns()
+        {
+            return new Column[]
+                {
+                    new Column()
+                    {
+                        width = 440,
+                        headerContent = new GUIContent(
+                            GetColumnName(IncomingChangesTreeColumn.Path)),
+                        minWidth = 200,
+                        allowToggleVisibility = false,
+                    },
+                    new Column()
+                    {
+                        width = 150,
+                        headerContent = new GUIContent(
+                            GetColumnName(IncomingChangesTreeColumn.LastEditedBy)),
+                        minWidth = 80
+                    },
+                    new Column()
+                    {
+                        width = 80,
+                        headerContent = new GUIContent(
+                            GetColumnName(IncomingChangesTreeColumn.Size)),
+                        minWidth = 45
+                    },
+                    new Column()
+                    {
+                        width = 260,
+                        headerContent = new GUIContent(
+                            GetColumnName(IncomingChangesTreeColumn.DateModififed)),
+                        minWidth = 100
+                    }
+                };
+        }
+
+        IncomingChangesTreeHeaderState(Column[] columns)
+            : base(columns)
+        {
+            if (mHeaderTitles == null)
+                mHeaderTitles = TreeHeaderColumns.GetTitles(columns);
+
+            if (mColumsAllowedToggleVisibility == null)
+                mColumsAllowedToggleVisibility = TreeHeaderColumns.GetVisibilities(columns);
+        }
+
+        [SerializeField]
+        string[] mHeaderTitles;
+
+        [SerializeField]
+        bool[] mColumsAllowedToggleVisibility;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeHeaderState.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeHeaderState.cs.meta
new file mode 100644
index 0000000..3fd8361
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeHeaderState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c0821447a35700c4280782d1092cf4c5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeView.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeView.cs
new file mode 100644
index 0000000..8336003
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeView.cs
@@ -0,0 +1,595 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.CM.Common;
+using Codice.Client.Common;
+using PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon
+{
+    internal class IncomingChangesTreeView : TreeView
+    {
+        internal IncomingChangesTreeView(
+            WorkspaceInfo wkInfo,
+            IncomingChangesTreeHeaderState headerState,
+            List<string> columnNames,
+            IncomingChangesViewMenu menu,
+            Action onCheckedNodeChanged)
+            : base(new TreeViewState())
+        {
+            mWkInfo = wkInfo;
+            mColumnNames = columnNames;
+            mMenu = menu;
+            mOnCheckedNodeChanged = onCheckedNodeChanged;
+
+            multiColumnHeader = new MultiColumnHeader(headerState);
+            multiColumnHeader.canSort = true;
+            multiColumnHeader.sortingChanged += SortingChanged;
+
+            customFoldoutYOffset = UnityConstants.TREEVIEW_FOLDOUT_Y_OFFSET;
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        protected override bool CanChangeExpandedState(TreeViewItem item)
+        {
+            return item is ChangeCategoryTreeViewItem;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem rootItem)
+        {
+            try
+            {
+                RegenerateRows(
+                    mIncomingChangesTree, mTreeViewItemIds, this,
+                        rootItem, mRows, mExpandCategories);
+            }
+            finally
+            {
+                mExpandCategories = false;
+            }
+
+            return mRows;
+        }
+
+        protected override void CommandEventHandling()
+        {
+            // NOTE - empty override to prevent crash when pressing ctrl-a in the treeview
+        }
+
+        protected override void ContextClickedItem(int id)
+        {
+            mMenu.Popup();
+            Repaint();
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            DrawTreeViewItem.InitializeStyles();
+
+            if (args.item is ChangeCategoryTreeViewItem)
+            {
+                CategoryTreeViewItemGUI(
+                    args.rowRect, rowHeight,
+                    (ChangeCategoryTreeViewItem)args.item,
+                    mOnCheckedNodeChanged,
+                    mSolvedConflicts.Count,
+                    args.selected, args.focused);
+                return;
+            }
+
+            if (args.item is ChangeTreeViewItem)
+            {
+                ChangeTreeViewItem changeTreeViewItem =
+                    (ChangeTreeViewItem)args.item;
+
+                IncomingChangeInfo changeInfo = changeTreeViewItem.ChangeInfo;
+                IncomingChangeInfo metaChangeInfo = mIncomingChangesTree.GetMetaChange(
+                    changeInfo);
+
+                bool isCurrentConflict = IsCurrentConflict(
+                    changeInfo,
+                    metaChangeInfo,
+                    mCurrentConflict);
+
+                bool isSolvedConflict = IsSolvedConflict(
+                    changeInfo,
+                    metaChangeInfo,
+                    mSolvedConflicts);
+
+                IncomingChangeTreeViewItemGUI(
+                    mWkInfo.ClientPath,
+                    mIncomingChangesTree,
+                    this,
+                    changeTreeViewItem,
+                    mOnCheckedNodeChanged, args,
+                    isCurrentConflict,
+                    isSolvedConflict);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        internal void BuildModel(UnityIncomingChangesTree tree)
+        {
+            mTreeViewItemIds.Clear();
+
+            mIncomingChangesTree = tree;
+            mSolvedConflicts = new List<IncomingChangeInfo>();
+            mCurrentConflict = null;
+
+            mExpandCategories = true;
+        }
+
+        internal void UpdateSolvedFileConflicts(
+            List<IncomingChangeInfo> solvedConflicts,
+            IncomingChangeInfo currentConflict)
+        {
+            mSolvedConflicts = solvedConflicts;
+            mCurrentConflict = currentConflict;
+        }
+
+        internal void Sort()
+        {
+            int sortedColumnIdx = multiColumnHeader.state.sortedColumnIndex;
+            bool sortAscending = multiColumnHeader.IsSortedAscending(sortedColumnIdx);
+
+            mIncomingChangesTree.Sort(
+                mColumnNames[sortedColumnIdx],
+                sortAscending);
+        }
+
+        internal IncomingChangeInfo GetMetaChange(IncomingChangeInfo change)
+        {
+            if (change == null)
+                return null;
+
+            return mIncomingChangesTree.GetMetaChange(change);
+        }
+
+        internal void FillWithMeta(List<IncomingChangeInfo> changes)
+        {
+            mIncomingChangesTree.FillWithMeta(changes);
+        }
+
+        internal bool SelectionHasMeta()
+        {
+            IncomingChangeInfo selectedChangeInfo = GetSelectedIncomingChange();
+
+            if (selectedChangeInfo == null)
+                return false;
+
+            return mIncomingChangesTree.HasMeta(selectedChangeInfo);
+        }
+
+        internal IncomingChangeInfo GetSelectedIncomingChange()
+        {
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count != 1)
+                return null;
+
+            int selectedId = selectedIds[0];
+
+            foreach (KeyValuePair<IncomingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (selectedId == item.Value)
+                    return item.Key;
+            }
+
+            return null;
+        }
+
+        internal List<IncomingChangeInfo> GetSelectedIncomingChanges()
+        {
+            List<IncomingChangeInfo> result = new List<IncomingChangeInfo>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<IncomingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                result.Add(item.Key);
+            }
+
+            return result;
+        }
+
+        internal List<IncomingChangeInfo> GetSelectedFileConflicts()
+        {
+            List<IncomingChangeInfo> result = new List<IncomingChangeInfo>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<IncomingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                if (item.Key.CategoryType != IncomingChangeCategory.Type.Conflicted)
+                    continue;
+
+                result.Add(item.Key);
+            }
+
+            return result;
+        }
+
+        void SortingChanged(MultiColumnHeader multiColumnHeader)
+        {
+            Sort();
+
+            Reload();
+        }
+
+        static bool IsCurrentConflict(
+            IncomingChangeInfo changeInfo,
+            IncomingChangeInfo metaChangeInfo,
+            IncomingChangeInfo currentConflict)
+        {
+            if (metaChangeInfo == null)
+                return currentConflict == changeInfo;
+
+            return currentConflict == changeInfo ||
+                   currentConflict == metaChangeInfo;
+        }
+
+        static bool IsSolvedConflict(
+            IncomingChangeInfo changeInfo,
+            IncomingChangeInfo metaChangeInfo,
+            List<IncomingChangeInfo> solvedConflicts)
+        {
+            if (metaChangeInfo == null)
+                return solvedConflicts.Contains(changeInfo);
+
+            return solvedConflicts.Contains(changeInfo) &&
+                   solvedConflicts.Contains(metaChangeInfo);
+        }
+
+        static void RegenerateRows(
+            UnityIncomingChangesTree incomingChangesTree,
+            TreeViewItemIds<IncomingChangeCategory, IncomingChangeInfo> treeViewItemIds,
+            IncomingChangesTreeView treeView,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows,
+            bool expandCategories)
+        {
+            if (incomingChangesTree == null)
+                return;
+
+            ClearRows(rootItem, rows);
+
+            List<IncomingChangeCategory> categories = incomingChangesTree.GetNodes();
+
+            if (categories == null)
+                return;
+
+            List<int> categoriesToExpand = new List<int>();
+
+            foreach (IncomingChangeCategory category in categories)
+            {
+                int categoryId;
+                if (!treeViewItemIds.TryGetCategoryItemId(category, out categoryId))
+                    categoryId = treeViewItemIds.AddCategoryItem(category);
+
+                ChangeCategoryTreeViewItem categoryTreeViewItem =
+                    new ChangeCategoryTreeViewItem(categoryId, category);
+
+                rootItem.AddChild(categoryTreeViewItem);
+                rows.Add(categoryTreeViewItem);
+
+                if (!ShouldExpandCategory(
+                        treeView, categoryTreeViewItem,
+                        categories.Count, expandCategories))
+                    continue;
+
+                categoriesToExpand.Add(categoryTreeViewItem.id);
+
+                foreach (IncomingChangeInfo incomingChange in category.GetChanges())
+                {
+                    int changeId;
+                    if (!treeViewItemIds.TryGetInfoItemId(incomingChange, out changeId))
+                        changeId = treeViewItemIds.AddInfoItem(incomingChange);
+
+                    TreeViewItem changeTreeViewItem =
+                        new ChangeTreeViewItem(changeId, incomingChange);
+
+                    categoryTreeViewItem.AddChild(changeTreeViewItem);
+                    rows.Add(changeTreeViewItem);
+                }
+            }
+
+            treeView.state.expandedIDs = categoriesToExpand;
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static void UpdateCheckStateForSelection(
+            IncomingChangesTreeView treeView,
+            ChangeTreeViewItem senderTreeViewItem)
+        {
+            IList<int> selectedIds = treeView.GetSelection();
+
+            if (selectedIds.Count <= 1)
+                return;
+
+            if (!selectedIds.Contains(senderTreeViewItem.id))
+                return;
+
+            bool isChecked = senderTreeViewItem.ChangeInfo.IsChecked();
+
+            foreach (TreeViewItem treeViewItem in treeView.FindRows(selectedIds))
+            {
+                if (treeViewItem is ChangeCategoryTreeViewItem)
+                {
+                    ((ChangeCategoryTreeViewItem)treeViewItem).Category
+                        .UpdateCheckedState(isChecked);
+                    continue;
+                }
+
+                ((ChangeTreeViewItem)treeViewItem).ChangeInfo
+                    .UpdateCheckedState(isChecked);
+            }
+        }
+
+        static void CategoryTreeViewItemGUI(
+            Rect rowRect,
+            float rowHeight,
+            ChangeCategoryTreeViewItem item,
+            Action onCheckedNodeChanged,
+            int solvedConflictsCount,
+            bool isSelected,
+            bool isFocused)
+        {
+            Texture icon = GetCategoryIcon(item.Category.CategoryType);
+            string label = item.Category.GetHeaderText();
+
+            bool wasChecked = item.Category.IsChecked();
+            bool hadCheckedChildren = item.Category.GetCheckedChangesCount() > 0;
+
+            DefaultStyles.label = GetCategoryStyle(
+                item.Category, solvedConflictsCount, isSelected);
+
+            bool isChecked = DrawTreeViewItem.ForCheckableCategoryItem(
+                rowRect, rowHeight, item.depth, icon, label,
+                isSelected, isFocused, wasChecked, hadCheckedChildren);
+
+            DefaultStyles.label = UnityStyles.Tree.Label;
+
+            if (!wasChecked && isChecked)
+            {
+                item.Category.UpdateCheckedState(true);
+                onCheckedNodeChanged();
+                return;
+            }
+
+            if (wasChecked && !isChecked)
+            {
+                item.Category.UpdateCheckedState(false);
+                onCheckedNodeChanged();
+                return;
+            }
+        }
+
+        static void IncomingChangeTreeViewItemGUI(
+            string wkPath,
+            UnityIncomingChangesTree incomingChangesTree,
+            IncomingChangesTreeView treeView,
+            ChangeTreeViewItem item,
+            Action onCheckedNodeChanged,
+            RowGUIArgs args,
+            bool isCurrentConflict,
+            bool isSolvedConflict)
+        {
+            for (int visibleColumnIdx = 0; visibleColumnIdx < args.GetNumVisibleColumns(); visibleColumnIdx++)
+            {
+                Rect cellRect = args.GetCellRect(visibleColumnIdx);
+
+                IncomingChangesTreeColumn column =
+                    (IncomingChangesTreeColumn)args.GetColumn(visibleColumnIdx);
+
+                IncomingChangeTreeViewItemCellGUI(
+                    wkPath,
+                    cellRect,
+                    treeView.rowHeight, 
+                    incomingChangesTree,
+                    treeView,
+                    item,
+                    onCheckedNodeChanged,
+                    column,
+                    args.selected,
+                    args.focused,
+                    isCurrentConflict,
+                    isSolvedConflict);
+            }
+        }
+
+        static void IncomingChangeTreeViewItemCellGUI(
+            string wkPath,
+            Rect rect,
+            float rowHeight,
+            UnityIncomingChangesTree incomingChangesTree,
+            IncomingChangesTreeView treeView,
+            ChangeTreeViewItem item,
+            Action onCheckedNodeChanged,
+            IncomingChangesTreeColumn column,
+            bool isSelected,
+            bool isFocused,
+            bool isCurrentConflict,
+            bool isSolvedConflict)
+        {
+            IncomingChangeInfo incomingChange = item.ChangeInfo;
+
+            string label = incomingChange.GetColumnText(
+                IncomingChangesTreeHeaderState.GetColumnName(column));
+
+            if (column == IncomingChangesTreeColumn.Path)
+            {
+                if (incomingChangesTree.HasMeta(item.ChangeInfo))
+                    label = string.Concat(label, UnityConstants.TREEVIEW_META_LABEL);
+
+                Texture icon = GetIcon(wkPath, incomingChange);
+                GetChangesOverlayIcon.Data overlayIconData =
+                    GetChangesOverlayIcon.ForGluonIncomingChange(
+                        incomingChange, isSolvedConflict);
+
+                bool wasChecked = incomingChange.IsChecked();
+
+                bool isChecked = DrawTreeViewItem.ForCheckableItemCell(
+                    rect, rowHeight, item.depth,
+                    icon, overlayIconData, label,
+                    isSelected, isFocused, isCurrentConflict,
+                    wasChecked);
+
+                incomingChange.UpdateCheckedState(isChecked);
+
+                if (wasChecked != isChecked)
+                {
+                    UpdateCheckStateForSelection(treeView, item);
+                    onCheckedNodeChanged();
+                }
+
+                return;
+            }
+
+            if (column == IncomingChangesTreeColumn.Size)
+            {
+                DrawTreeViewItem.ForSecondaryLabelRightAligned(
+                    rect, label, isSelected, isFocused, isCurrentConflict);
+                return;
+            }
+
+            DrawTreeViewItem.ForSecondaryLabel(
+                rect, label, isSelected, isFocused, isCurrentConflict);
+        }
+
+        static Texture GetCategoryIcon(
+            IncomingChangeCategory.Type categoryType)
+        {
+            switch (categoryType)
+            {
+                case IncomingChangeCategory.Type.Conflicted:
+                    return Images.GetImage(Images.Name.IconMergeConflict);
+                case IncomingChangeCategory.Type.Changed:
+                    return Images.GetImage(Images.Name.IconChanged);
+                case IncomingChangeCategory.Type.Moved:
+                    return Images.GetImage(Images.Name.IconMoved);
+                case IncomingChangeCategory.Type.Deleted:
+                    return Images.GetImage(Images.Name.IconDeleted);
+                case IncomingChangeCategory.Type.Added:
+                    return Images.GetImage(Images.Name.IconAdded);
+                default:
+                    return null;
+            }
+        }
+
+        static Texture GetIcon(
+            string wkPath,
+            IncomingChangeInfo incomingChange)
+        {
+            bool isDirectory = incomingChange.GetRevision().
+                Type == EnumRevisionType.enDirectory;
+
+            if (isDirectory || incomingChange.IsXLink())
+                return Images.GetDirectoryIcon();
+
+            string fullPath = WorkspacePath.GetWorkspacePathFromCmPath(
+                wkPath, incomingChange.GetPath(), Path.DirectorySeparatorChar);
+
+            return Images.GetFileIcon(fullPath);
+        }
+
+        static GUIStyle GetCategoryStyle(
+            IncomingChangeCategory category,
+            int solvedConflictsCount,
+            bool isSelected)
+        {
+            if (isSelected)
+                return UnityStyles.Tree.Label;
+
+            if (category.CategoryType != IncomingChangeCategory.Type.Conflicted)
+                return UnityStyles.Tree.Label;
+
+            return category.GetChildrenCount() > solvedConflictsCount ?
+                UnityStyles.Tree.RedLabel : UnityStyles.Tree.GreenLabel;
+        }
+
+        static bool ShouldExpandCategory(
+            IncomingChangesTreeView treeView,
+            ChangeCategoryTreeViewItem categoryTreeViewItem,
+            int categoriesCount,
+            bool expandCategories)
+        {
+            if (expandCategories)
+            {
+                if (categoriesCount == 1)
+                    return true;
+
+                if (categoryTreeViewItem.Category.CategoryType
+                        == IncomingChangeCategory.Type.Conflicted)
+                    return true;
+
+                if (categoryTreeViewItem.Category.GetChildrenCount()
+                        > NODES_TO_EXPAND_CATEGORY)
+                    return false;
+
+                return true;
+            }
+
+            return treeView.IsExpanded(categoryTreeViewItem.id);
+        }
+
+        bool mExpandCategories;
+
+        TreeViewItemIds<IncomingChangeCategory, IncomingChangeInfo> mTreeViewItemIds =
+            new TreeViewItemIds<IncomingChangeCategory, IncomingChangeInfo>();
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        IncomingChangeInfo mCurrentConflict;
+        List<IncomingChangeInfo> mSolvedConflicts;
+        UnityIncomingChangesTree mIncomingChangesTree;
+
+        readonly Action mOnCheckedNodeChanged;
+        readonly IncomingChangesViewMenu mMenu;
+        readonly List<string> mColumnNames;
+        readonly WorkspaceInfo mWkInfo;
+
+        const int NODES_TO_EXPAND_CATEGORY = 10;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeView.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeView.cs.meta
new file mode 100644
index 0000000..f723d51
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesTreeView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7f2f2eb277e02054cbc5ccee904b593b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesViewMenu.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesViewMenu.cs
new file mode 100644
index 0000000..3aa63dd
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesViewMenu.cs
@@ -0,0 +1,218 @@
+using UnityEngine;
+
+using UnityEditor;
+
+using PlasticGui;
+using PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon
+{
+    internal class IncomingChangesViewMenu
+    {
+        internal interface IMetaMenuOperations
+        {
+            void DiffIncomingChanges();
+            void DiffYoursWithIncoming();
+            bool SelectionHasMeta();
+        }
+
+        internal IncomingChangesViewMenu(
+            IIncomingChangesViewMenuOperations incomingChangesViewMenuOperations,
+            IMetaMenuOperations incomingChangesMetaMenuOperations)
+        {
+            mIncomingChangesViewMenuOperations = incomingChangesViewMenuOperations;
+            mIncomingChangesMetaMenuOperations = incomingChangesMetaMenuOperations;
+
+            BuildComponents();
+        }
+
+        internal void Popup()
+        {
+            GenericMenu menu = new GenericMenu();
+
+            UpdateMenuItems(menu);
+
+            menu.ShowAsContext();
+        }
+
+        void MergeSelectedFilesMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.MergeContributors();
+        }
+
+        void MergeKeepingSourceChangesMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.MergeKeepingSourceChanges();
+        }
+
+        void MergeKeepingWorkspaceChangesMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges();
+        }
+
+        void DiffYoursWithIncomingMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.DiffYoursWithIncoming();
+        }
+
+        void DiffIncomingChangesMenuItem_Click()
+        {
+            mIncomingChangesViewMenuOperations.DiffIncomingChanges();
+        }
+
+        void DiffMetaYoursWithIncomingMenuItem_Click()
+        {
+            mIncomingChangesMetaMenuOperations.DiffYoursWithIncoming();
+        }
+
+        void DiffMetaIncomingChangesMenuItem_Click()
+        {
+            mIncomingChangesMetaMenuOperations.DiffIncomingChanges();
+        }
+
+        void UpdateMenuItems(GenericMenu menu)
+        {
+            SelectedIncomingChangesGroupInfo info =
+                mIncomingChangesViewMenuOperations.GetSelectedIncomingChangesGroupInfo();
+            IncomingChangesMenuOperations operations =
+                UpdateIncomingChangesMenu.GetAvailableMenuOperations(info);
+
+            if (operations == IncomingChangesMenuOperations.None)
+            {
+                menu.AddDisabledItem(GetNoActionMenuItemContent());
+                return;
+            }
+
+            AddMergeActions(menu, operations);
+
+            menu.AddSeparator(string.Empty);
+
+            AddDiffActions(menu, operations);
+
+            if (!mIncomingChangesMetaMenuOperations.SelectionHasMeta())
+                return;
+
+            menu.AddSeparator(string.Empty);
+
+            AddMetaActions(menu, operations);
+        }
+
+        void AddMergeActions(
+            GenericMenu menu,
+            IncomingChangesMenuOperations operations)
+        {
+            if (operations.HasFlag(IncomingChangesMenuOperations.MergeContributors))
+                menu.AddItem(mMergeSelectedFilesMenuItemContent, false,
+                    MergeSelectedFilesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mMergeSelectedFilesMenuItemContent);
+
+            if (operations.HasFlag(IncomingChangesMenuOperations.MergeKeepingSourceChanges))
+                menu.AddItem(mMergeKeepingSourceChangesMenuItemContent, false,
+                    MergeKeepingSourceChangesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mMergeKeepingSourceChangesMenuItemContent);
+
+            if (operations.HasFlag(IncomingChangesMenuOperations.MergeKeepingWorkspaceChanges))
+                menu.AddItem(mMergeKeepingWorkspaceChangesMenuItemContent, false,
+                    MergeKeepingWorkspaceChangesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mMergeKeepingWorkspaceChangesMenuItemContent);
+        }
+
+        void AddDiffActions(GenericMenu menu, IncomingChangesMenuOperations operations)
+        {
+            if (operations.HasFlag(IncomingChangesMenuOperations.DiffYoursWithIncoming))
+                menu.AddItem(mDiffYoursWithIncomingMenuItemContent, false,
+                    DiffYoursWithIncomingMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffYoursWithIncomingMenuItemContent);
+
+            if (operations.HasFlag(IncomingChangesMenuOperations.DiffIncomingChanges))
+                menu.AddItem(mDiffIncomingChangesMenuItemContent, false,
+                    DiffIncomingChangesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffIncomingChangesMenuItemContent);
+        }
+
+        void AddMetaActions(GenericMenu menu, IncomingChangesMenuOperations operations)
+        {
+            if (operations.HasFlag(IncomingChangesMenuOperations.DiffYoursWithIncoming))
+                menu.AddItem(mDiffMetaYoursWithIncomingMenuItemContent, false,
+                    DiffMetaYoursWithIncomingMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffMetaYoursWithIncomingMenuItemContent);
+
+            if (operations.HasFlag(IncomingChangesMenuOperations.DiffIncomingChanges))
+                menu.AddItem(mDiffMetaIncomingChangesMenuItemContent, false,
+                    DiffMetaIncomingChangesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffMetaIncomingChangesMenuItemContent);
+        }
+
+        GUIContent GetNoActionMenuItemContent()
+        {
+            if (mNoActionMenuItemContent == null)
+            {
+                mNoActionMenuItemContent = new GUIContent(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.NoActionMenuItem));
+            }
+
+            return mNoActionMenuItemContent;
+        }
+
+        void BuildComponents()
+        {
+            mMergeSelectedFilesMenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.
+                    Name.MergeSelectedFiles));
+            mMergeKeepingSourceChangesMenuItemContent = new GUIContent(
+                UnityMenuItem.EscapedText(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.IncomingChangesMenuItemMergeKeepingSourceChanges)));
+            mMergeKeepingWorkspaceChangesMenuItemContent = new GUIContent(
+                UnityMenuItem.EscapedText(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.IncomingChangesMenuItemMergeKeepingWorkspaceChanges)));
+
+            string diffYoursWithIncomingText = UnityMenuItem.EscapedText(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.IncomingChangesMenuItemDiffYoursWithIncoming));
+
+            string diffIncomingChangesText = UnityMenuItem.EscapedText(
+                    PlasticLocalization.GetString(PlasticLocalization.
+                        Name.IncomingChangesMenuItemDiffIncomingChanges));
+
+            mDiffYoursWithIncomingMenuItemContent = new GUIContent(
+                diffYoursWithIncomingText);
+            mDiffIncomingChangesMenuItemContent = new GUIContent(
+                diffIncomingChangesText);
+
+            mDiffMetaYoursWithIncomingMenuItemContent = new GUIContent(
+                string.Format(
+                    "{0}/{1}",
+                    MetaPath.META_EXTENSION,
+                    diffYoursWithIncomingText));
+            mDiffMetaIncomingChangesMenuItemContent = new GUIContent(
+                string.Format(
+                    "{0}/{1}",
+                    MetaPath.META_EXTENSION,
+                    diffIncomingChangesText));
+        }
+
+        GUIContent mNoActionMenuItemContent;
+
+        GUIContent mMergeSelectedFilesMenuItemContent;
+        GUIContent mMergeKeepingSourceChangesMenuItemContent;
+        GUIContent mMergeKeepingWorkspaceChangesMenuItemContent;
+        GUIContent mDiffYoursWithIncomingMenuItemContent;
+        GUIContent mDiffIncomingChangesMenuItemContent;
+        GUIContent mDiffMetaYoursWithIncomingMenuItemContent;
+        GUIContent mDiffMetaIncomingChangesMenuItemContent;
+
+        readonly IIncomingChangesViewMenuOperations mIncomingChangesViewMenuOperations;
+        readonly IMetaMenuOperations mIncomingChangesMetaMenuOperations;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesViewMenu.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesViewMenu.cs.meta
new file mode 100644
index 0000000..0b298e0
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/IncomingChangesViewMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 349d4bc84d3b4fa48a1970539c06144c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTree.cs b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTree.cs
new file mode 100644
index 0000000..cc539f9
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTree.cs
@@ -0,0 +1,175 @@
+using System.Collections.Generic;
+
+using PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon
+{
+    internal class UnityIncomingChangesTree
+    {
+        internal static UnityIncomingChangesTree BuildIncomingChangeCategories(
+            IncomingChangesTree tree)
+        {
+            return new UnityIncomingChangesTree(tree);
+        }
+
+        UnityIncomingChangesTree(IncomingChangesTree tree)
+        {
+            mInnerTree = tree; 
+
+            mMetaCache.Build(mInnerTree.GetNodes());
+        }
+
+        internal List<IncomingChangeCategory> GetNodes()
+        {
+            return mInnerTree.GetNodes();
+        }
+
+        internal bool HasMeta(IncomingChangeInfo changeInfo)
+        {
+            return mMetaCache.ContainsMeta(changeInfo);
+        }
+
+        internal IncomingChangeInfo GetMetaChange(IncomingChangeInfo change)
+        {
+            return mMetaCache.GetExistingMeta(change);
+        }
+
+        internal void FillWithMeta(List<IncomingChangeInfo> changes)
+        {
+            changes.AddRange(
+                mMetaCache.GetExistingMeta(changes));
+        }
+
+        internal void Sort(string key, bool isAscending)
+        {
+            mInnerTree.Sort(key, isAscending);
+        }
+
+        MetaCache mMetaCache = new MetaCache();
+        IncomingChangesTree mInnerTree;
+
+        class MetaCache
+        {
+            internal bool ContainsMeta(IncomingChangeInfo changeInfo)
+            {
+                string key = BuildKey.ForMetaChange(changeInfo);
+
+                return mCache.ContainsKey(key);
+            }
+
+            internal IncomingChangeInfo GetExistingMeta(IncomingChangeInfo change)
+            {
+                IncomingChangeInfo result;
+
+                if (!mCache.TryGetValue(BuildKey.ForMetaChange(change), out result))
+                    return null;
+
+                return result;
+            }
+
+            internal List<IncomingChangeInfo> GetExistingMeta(
+                List<IncomingChangeInfo> changes)
+            {
+                List<IncomingChangeInfo> result = new List<IncomingChangeInfo>();
+
+                foreach (IncomingChangeInfo change in changes)
+                {
+                    string key = BuildKey.ForMetaChange(change);
+
+                    IncomingChangeInfo metaChange;
+                    if (!mCache.TryGetValue(key, out metaChange))
+                        continue;
+
+                    result.Add(metaChange);
+                }
+
+                return result;
+            }
+
+            internal void Build(List<IncomingChangeCategory> incomingChangesCategories)
+            {
+                mCache.Clear();
+
+                foreach (IncomingChangeCategory category in incomingChangesCategories)
+                {
+                    ExtractMetaToCache(category, mCache);
+                }
+            }
+
+            static void ExtractMetaToCache(
+                IncomingChangeCategory category,
+                Dictionary<string, IncomingChangeInfo> cache)
+            {
+                List<IncomingChangeInfo> changes = category.GetChanges();
+
+                HashSet<string> indexedKeys = BuildIndexedKeys(
+                    changes);
+
+                for (int i = changes.Count - 1; i >= 0; i--)
+                {
+                    IncomingChangeInfo currentChange = changes[i];
+
+                    string path = currentChange.GetPath();
+
+                    if (!MetaPath.IsMetaPath(path))
+                        continue;
+
+                    string realPath = MetaPath.GetPathFromMetaPath(path);
+
+                    if (!indexedKeys.Contains(BuildKey.BuildCacheKey(
+                        currentChange.CategoryType, realPath)))
+                        continue;
+
+                    // found foo.c and foo.c.meta - move .meta to cache
+                    cache.Add(BuildKey.ForChange(currentChange), currentChange);
+                    changes.RemoveAt(i);
+                }
+            }
+
+            static HashSet<string> BuildIndexedKeys(
+                List<IncomingChangeInfo> changes)
+            {
+                HashSet<string> result = new HashSet<string>();
+
+                foreach (IncomingChangeInfo change in changes)
+                {
+                    if (MetaPath.IsMetaPath(change.GetPath()))
+                        continue;
+
+                    result.Add(BuildKey.ForChange(change));
+                }
+
+                return result;
+            }
+
+            Dictionary<string, IncomingChangeInfo> mCache =
+                new Dictionary<string, IncomingChangeInfo>();
+
+            static class BuildKey
+            {
+                internal static string ForChange(
+                    IncomingChangeInfo change)
+                {
+                    return BuildCacheKey(
+                        change.CategoryType,
+                        change.GetPath());
+                }
+
+                internal static string ForMetaChange(
+                    IncomingChangeInfo change)
+                {
+                    return BuildCacheKey(
+                        change.CategoryType,
+                        MetaPath.GetMetaPath(change.GetPath()));
+                }
+
+                internal static string BuildCacheKey(
+                    IncomingChangeCategory.Type type,
+                    string path)
+                {
+                    return string.Concat(type, ":", path);
+                }
+            }
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTree.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTree.cs.meta
new file mode 100644
index 0000000..d409565
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTree.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6fb9548ec1290b943b7beca241c81e7d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/IIncomingChangesTab.cs b/Editor/PlasticSCM/Views/IncomingChanges/IIncomingChangesTab.cs
new file mode 100644
index 0000000..0c33ba7
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/IIncomingChangesTab.cs
@@ -0,0 +1,15 @@
+namespace Unity.PlasticSCM.Editor.Views.IncomingChanges
+{
+    internal interface IIncomingChangesTab
+    {
+        bool IsVisible
+        {
+            get; set;
+        }
+
+        void OnDisable();
+        void Update();
+        void OnGUI();
+        void AutoRefresh();
+    }
+}
diff --git a/Editor/PlasticSCM/Views/IncomingChanges/IIncomingChangesTab.cs.meta b/Editor/PlasticSCM/Views/IncomingChanges/IIncomingChangesTab.cs.meta
new file mode 100644
index 0000000..5349c9a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/IncomingChanges/IIncomingChangesTab.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7a04ed4805f84fd4a8ceee51915ba39a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/LaunchOperation.cs b/Editor/PlasticSCM/Views/LaunchOperation.cs
new file mode 100644
index 0000000..e7d46b2
--- /dev/null
+++ b/Editor/PlasticSCM/Views/LaunchOperation.cs
@@ -0,0 +1,76 @@
+using System.Collections.Generic;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.BaseCommands.EventTracking;
+using Codice.CM.Common;
+using PlasticGui;
+
+namespace Unity.PlasticSCM.Editor.Views
+{
+    internal static class LaunchOperation
+    {
+        internal static void CheckinForMode(
+            WorkspaceInfo wkInfo,
+            bool isGluonMode,
+            bool keepItemsLocked,
+            PlasticGUIClient plasticClient)
+        {
+            TrackFeatureUseEvent.For(
+                Plastic.API.GetRepositorySpec(wkInfo),
+                isGluonMode ?
+                    TrackFeatureUseEvent.Features.PartialCheckin :
+                    TrackFeatureUseEvent.Features.Checkin);
+
+            if (isGluonMode)
+            {
+                plasticClient.PartialCheckin(keepItemsLocked);
+                return;
+            }
+
+            plasticClient.Checkin();
+        }
+
+        internal static void UndoForMode(
+            bool isGluonMode,
+            PlasticGUIClient plasticClient)
+        {
+            if (isGluonMode)
+            {
+                plasticClient.PartialUndo();
+                return;
+            }
+
+            plasticClient.Undo();
+        }
+
+        internal static void UndoChangesForMode(
+            bool isGluonMode,
+            PlasticGUIClient plasticClient,
+            List<ChangeInfo> changesToUndo,
+            List<ChangeInfo> dependenciesCandidates)
+        {
+            if (isGluonMode)
+            {
+                plasticClient.PartialUndoChanges(
+                    changesToUndo, dependenciesCandidates);
+                return;
+            }
+
+            plasticClient.UndoChanges(
+                changesToUndo, dependenciesCandidates);
+        }
+
+        internal static void UpdateWorkspaceForMode(
+            bool isGluonMode,
+            PlasticGUIClient plasticClient)
+        {
+            if (isGluonMode)
+            {
+                plasticClient.PartialUpdateWorkspace();
+                return;
+            }
+
+            plasticClient.UpdateWorkspace();
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/LaunchOperation.cs.meta b/Editor/PlasticSCM/Views/LaunchOperation.cs.meta
new file mode 100644
index 0000000..5d89b63
--- /dev/null
+++ b/Editor/PlasticSCM/Views/LaunchOperation.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e89b45c621f186746b023a389a59c31e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges.meta b/Editor/PlasticSCM/Views/PendingChanges.meta
new file mode 100644
index 0000000..a47dd46
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5d558eb582a19cf46b06976fb93d7896
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/ChangeCategoryTreeViewItem.cs b/Editor/PlasticSCM/Views/PendingChanges/ChangeCategoryTreeViewItem.cs
new file mode 100644
index 0000000..df1d40e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/ChangeCategoryTreeViewItem.cs
@@ -0,0 +1,17 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui.WorkspaceWindow.PendingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal class ChangeCategoryTreeViewItem : TreeViewItem
+    {
+        internal PendingChangeCategory Category { get; private set; }
+
+        internal ChangeCategoryTreeViewItem(int id, PendingChangeCategory category)
+            : base(id, 0)
+        {
+            Category = category;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/ChangeCategoryTreeViewItem.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/ChangeCategoryTreeViewItem.cs.meta
new file mode 100644
index 0000000..2b5d9be
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/ChangeCategoryTreeViewItem.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: ade7225274b3d4c32a9eb7e64f83c5a1
+timeCreated: 1539786107
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/ChangeTreeViewItem.cs b/Editor/PlasticSCM/Views/PendingChanges/ChangeTreeViewItem.cs
new file mode 100644
index 0000000..affd383
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/ChangeTreeViewItem.cs
@@ -0,0 +1,21 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal class ChangeTreeViewItem : TreeViewItem
+    {
+        internal PendingChangeInfo ChangeInfo { get; private set; }
+
+        internal ChangeTreeViewItem(int id, PendingChangeInfo change)
+            : base(id, 1)
+        {
+            ChangeInfo = change;
+
+            displayName = change.GetColumnText(PlasticLocalization.GetString(
+                PlasticLocalization.Name.ItemColumn));
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/ChangeTreeViewItem.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/ChangeTreeViewItem.cs.meta
new file mode 100644
index 0000000..cef77cf
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/ChangeTreeViewItem.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: a9e847d045a7744b08c7a37912965cdc
+timeCreated: 1539688098
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs.meta b/Editor/PlasticSCM/Views/PendingChanges/Dialogs.meta
new file mode 100644
index 0000000..e1a7295
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6e70bba63d1604ffb90a65601cb8abae
+folderAsset: yes
+timeCreated: 1541005875
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinConflictsDialog.cs b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinConflictsDialog.cs
new file mode 100644
index 0000000..32d6c30
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinConflictsDialog.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.GameUI.Checkin;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs
+{
+    internal class CheckinConflictsDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 600, 418);
+            }
+        }
+
+        internal static ResponseType Show(
+            IList<CheckinConflict> conflicts,
+            PlasticLocalization.Name dialogTitle,
+            PlasticLocalization.Name dialogExplanation,
+            PlasticLocalization.Name okButtonCaption,
+            EditorWindow parentWindow)
+        {
+            CheckinConflictsDialog dialog = Create(
+                PlasticLocalization.GetString(dialogTitle),
+                PlasticLocalization.GetString(dialogExplanation),
+                GetConflictsText(conflicts),
+                PlasticLocalization.GetString(okButtonCaption));
+            return dialog.RunModal(parentWindow);
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(mDialogTitle);
+
+            Paragraph(mDialogExplanation);
+
+            Title(PlasticLocalization.GetString(PlasticLocalization.Name.ItemColumn));
+
+            ConflictsArea();
+
+            GUILayout.Space(20);
+
+            DoButtonsArea();
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.CheckinConflictsTitle);
+        }
+
+        void ConflictsArea()
+        {
+            mScrollPosition = EditorGUILayout.BeginScrollView(
+                   mScrollPosition, EditorStyles.helpBox, GUILayout.Height(205));
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(6);
+                Paragraph(mConflictsText);
+            }
+
+            EditorGUILayout.EndScrollView();
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoOkButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoOkButton();
+            }
+        }
+
+        void DoOkButton()
+        {
+            if (!AcceptButton(mOkButtonCaption))
+                return;
+
+            OkButtonAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        static string GetConflictsText(IList<CheckinConflict> conflicts)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            foreach (CheckinConflict conflict in conflicts)
+            {
+                sb.AppendFormat(
+                    "{0} {1}{2}",
+                    conflict.Description,
+                    conflict.ActionMessage,
+                    Environment.NewLine);
+            }
+
+            return sb.ToString();
+        }
+
+        static CheckinConflictsDialog Create(
+            string dialogTitle,
+            string dialogExplanation,
+            string conflictsText,
+            string okButtonCaption)
+        {
+            var instance = CreateInstance<CheckinConflictsDialog>();
+            instance.mDialogTitle = dialogTitle;
+            instance.mDialogExplanation = dialogExplanation;
+            instance.mConflictsText = conflictsText;
+            instance.mOkButtonCaption = okButtonCaption;
+            instance.mEnterKeyAction = instance.OkButtonAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            return instance;
+        }
+
+        Vector2 mScrollPosition;
+
+        string mDialogTitle;
+        string mDialogExplanation;
+        string mConflictsText;
+        string mOkButtonCaption;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinConflictsDialog.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinConflictsDialog.cs.meta
new file mode 100644
index 0000000..325f542
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinConflictsDialog.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 615fa68a626934ca28141174234fee26
+timeCreated: 1542733474
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinMergeNeededDialog.cs b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinMergeNeededDialog.cs
new file mode 100644
index 0000000..3ae88b4
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinMergeNeededDialog.cs
@@ -0,0 +1,231 @@
+using UnityEditor;
+using UnityEngine;
+
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs
+{
+    internal class CheckinMergeNeededDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 650, 390);
+            }
+        }
+        internal static CheckinMergeNeededData Merge(
+            WorkspaceInfo wkInfo,
+            EditorWindow parentWindow)
+        {
+            RepositorySpec repSpec = Plastic.API.GetRepositorySpec(wkInfo);
+            BranchInfo parentBranchInfo = Plastic.API.GetWorkingBranch(wkInfo);
+
+            CheckinMergeNeededDialog dialog = Create(
+                repSpec, parentBranchInfo,
+                new ProgressControlsForDialogs());
+
+            ResponseType dialogResult = dialog.RunModal(parentWindow);
+
+            CheckinMergeNeededData result = new CheckinMergeNeededData(
+                repSpec, parentBranchInfo,
+                dialog.mMergeNow, dialog.mChildBranchName);
+
+            result.Result = dialogResult == ResponseType.Ok;
+            return result;
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(
+                PlasticLocalization.Name.CheckinMergeRequest));
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.CheckinMergeRequestMessage));
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.CheckinMergeRequestQuestion));
+
+            DoMergeNowArea();
+
+            DoMergeLaterArea();
+
+            GUILayout.Space(10);
+
+            DrawProgressForDialogs.For(
+                mProgressControls.ProgressData);
+
+            GUILayout.Space(10);
+
+            DoButtonsArea();
+
+            mProgressControls.ForcedUpdateProgress(this);
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.CheckinMergeTitle);
+        }
+
+        void DoMergeNowArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                EditorGUI.BeginChangeCheck();
+                bool mergeNowChecked = RadioToggle(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CheckinMergeNow), mMergeNow);
+                if (EditorGUI.EndChangeCheck() && mergeNowChecked)
+                {
+                    mMergeNow = mergeNowChecked; // Just check
+                }
+                GUILayout.FlexibleSpace();
+            }
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(45);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CheckinMergeNowMessage));
+            }
+        }
+
+        void DoMergeLaterArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                EditorGUI.BeginChangeCheck();
+                bool mergeLaterChecked = RadioToggle(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CheckinMergeLater), !mMergeNow);
+                if (EditorGUI.EndChangeCheck() && mergeLaterChecked)
+                {
+                    mMergeNow = !mergeLaterChecked; // Just uncheck
+                }
+                GUILayout.FlexibleSpace();
+            }
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(45);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CheckinMergeLaterMessage,
+                    mCurrentBranchInfo.BranchName));
+            }
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(60);
+                GUILayout.Label(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CheckinMergeBranch), UnityStyles.Paragraph);
+                GUILayout.Space(-10);
+                using (new EditorGUILayout.VerticalScope())
+                {
+                    GUILayout.Space(6);
+
+                    GUI.enabled = !mMergeNow;
+
+                    mChildBranchName = EditorGUILayout.TextField(
+                        string.Empty, mChildBranchName);
+
+                    GUI.enabled = true;
+                }
+            }
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUI.DisabledScope(
+                mProgressControls.ProgressData.IsWaitingAsyncResult))
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoMergeButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoMergeButton();
+            }
+        }
+
+        void DoMergeButton()
+        {
+            if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.MergeButton)))
+                return;
+
+            MergeButtonAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        void MergeButtonAction()
+        {
+            CheckinMergeNeededData data = new CheckinMergeNeededData(
+                mRepSpec, mCurrentBranchInfo, mMergeNow, mChildBranchName);
+
+            CheckinMergeNeededValidation.AsyncValidation(
+                data, this, mProgressControls);
+        }
+
+        bool RadioToggle(string text, bool isOn)
+        {
+            var rect = GUILayoutUtility.GetRect(
+                new GUIContent(text), UnityStyles.Dialog.RadioToggle);
+
+            bool isOnAfter = EditorGUI.Toggle(
+                rect, isOn, UnityStyles.Dialog.RadioToggle);
+
+            GUI.Label(
+                new Rect(
+                    rect.x + rect.height, rect.y,
+                    rect.xMax - rect.height, rect.height),
+                text, UnityStyles.Paragraph);
+
+            return isOnAfter;
+        }
+
+        static CheckinMergeNeededDialog Create(
+            RepositorySpec repSpec,
+            BranchInfo currentBranchInfo,
+            ProgressControlsForDialogs progressControls)
+        {
+            var instance = CreateInstance<CheckinMergeNeededDialog>();
+            instance.mRepSpec = repSpec;
+            instance.mCurrentBranchInfo = currentBranchInfo;
+            instance.mProgressControls = progressControls;
+            instance.mEnterKeyAction = instance.MergeButtonAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            return instance;
+        }
+
+        [SerializeField]
+        bool mMergeNow = true;
+        [SerializeField]
+        string mChildBranchName = DEFAULT_BRANCH_NAME;
+
+        ProgressControlsForDialogs mProgressControls;
+        BranchInfo mCurrentBranchInfo;
+        RepositorySpec mRepSpec;
+
+        const string DEFAULT_BRANCH_NAME = "task000";
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinMergeNeededDialog.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinMergeNeededDialog.cs.meta
new file mode 100644
index 0000000..fce3100
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/CheckinMergeNeededDialog.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: e618da42af60f4600a4bc48211cbae9f
+timeCreated: 1541414834
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/DependenciesDialog.cs b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/DependenciesDialog.cs
new file mode 100644
index 0000000..5c0d520
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/DependenciesDialog.cs
@@ -0,0 +1,166 @@
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs
+{
+    internal class DependenciesDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 650, 430);
+            }
+        }
+
+        internal static bool IncludeDependencies(
+            WorkspaceInfo wkInfo,
+            IList<ChangeDependencies<ChangeInfo>> changesDependencies,
+            string operation,
+            EditorWindow parentWindow)
+        {
+            DependenciesDialog dialog = Create(wkInfo, changesDependencies, operation);
+            return dialog.RunModal(parentWindow) == ResponseType.Ok;
+        }
+
+        protected override void OnModalGUI()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                Title(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.DependenciesDialogTitle));
+            }
+
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.DependenciesExplanation, mOperation));
+
+            Title(PlasticLocalization.GetString(PlasticLocalization.Name.ItemColumn));
+
+            Rect scrollWidth = GUILayoutUtility.GetRect(0, position.width, 1, 1);
+            GUI.DrawTexture(
+                new Rect(scrollWidth.x, scrollWidth.y, scrollWidth.width, 200),
+                Texture2D.whiteTexture);
+
+            DoDependenciesArea();
+
+            GUILayout.Space(20);
+
+            DoButtonsArea();
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.DependenciesDialogTitle);
+        }
+
+        void DoDependenciesArea()
+        {
+            // NOTE(rafa): We cannot use a tree view here because it misbehaves with the way we create the modals
+            mScrollPosition = EditorGUILayout.BeginScrollView(mScrollPosition, GUILayout.Height(200));
+
+            for (int i = 0; i < mChangesDependencies.Count; i++)
+            {
+                var dependant = mChangesDependencies[i];
+                bool isExpanded = mExpandedDependencies[i];
+
+                isExpanded = EditorGUILayout.Foldout(
+                    isExpanded,
+                    ChangeInfoView.GetPathDescription(
+                        mWkInfo.ClientPath, dependant.Change),
+                    UnityStyles.Dialog.Foldout);
+
+                mExpandedDependencies[i] = isExpanded;
+
+                if (isExpanded)
+                {
+                    for (int j = 0; j < dependant.Dependencies.Count; j++)
+                    {
+                        using (new EditorGUILayout.HorizontalScope())
+                        {
+                            GUILayout.Space(20);
+                            GUILayout.Label(
+                                ChangeInfoView.GetPathDescription(
+                                    mWkInfo.ClientPath, dependant.Dependencies[j]),
+                                UnityStyles.Paragraph);
+                        }
+                    }
+                }
+            }
+
+            EditorGUILayout.EndScrollView();
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoOkButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoOkButton();
+            }
+        }
+
+        void DoOkButton()
+        {
+            if (!AcceptButton(mOperation))
+                return;
+
+            OkButtonAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        static DependenciesDialog Create(
+            WorkspaceInfo wkInfo,
+            IList<ChangeDependencies<ChangeInfo>> changesDependencies,
+            string operation)
+        {
+            var instance = CreateInstance<DependenciesDialog>();
+
+            instance.mWkInfo = wkInfo;
+            instance.mChangesDependencies = changesDependencies;
+            instance.mOperation = operation;
+            instance.mEnterKeyAction = instance.OkButtonAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+
+            instance.mExpandedDependencies = new bool[changesDependencies.Count];
+            for (int i = 0; i < changesDependencies.Count; i++)
+                instance.mExpandedDependencies[i] = true;
+
+            return instance;
+        }
+
+        bool[] mExpandedDependencies;
+        Vector2 mScrollPosition;
+
+        string mOperation;
+        IList<ChangeDependencies<ChangeInfo>> mChangesDependencies;
+        WorkspaceInfo mWkInfo;
+    }
+}
+
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/DependenciesDialog.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/DependenciesDialog.cs.meta
new file mode 100644
index 0000000..ca35e3b
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/DependenciesDialog.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: c584c584ba20f4daea226141b9e55bd0
+timeCreated: 1541611814
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/FilterRulesConfirmationDialog.cs b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/FilterRulesConfirmationDialog.cs
new file mode 100644
index 0000000..cba665e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/FilterRulesConfirmationDialog.cs
@@ -0,0 +1,186 @@
+using System;
+using System.Reflection;
+
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.Items;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs
+{
+    internal class FilterRulesConfirmationDialog : PlasticDialog
+    {
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 520, 350);
+            }
+        }
+
+        internal static FilterRulesConfirmationData AskForConfirmation(
+            string[] rules,
+            bool isAddOperation,
+            bool isApplicableToAllWorkspaces,
+            EditorWindow parentWindow)
+        {
+            string explanation = PlasticLocalization.GetString(isAddOperation ?
+                PlasticLocalization.Name.FilterRulesConfirmationAddMessage :
+                PlasticLocalization.Name.FilterRulesConfirmationRemoveMessage);
+
+            FilterRulesConfirmationDialog dialog = Create(
+                explanation, GetRulesText(rules), isApplicableToAllWorkspaces);
+
+            ResponseType dialogResult = dialog.RunModal(parentWindow);
+
+            FilterRulesConfirmationData result = new FilterRulesConfirmationData(
+                dialog.mApplyRulesToAllWorkspace, dialog.GetRules());
+
+            result.Result = dialogResult == ResponseType.Ok;
+            return result;
+        }
+
+        protected override void OnModalGUI()
+        {
+            Title(PlasticLocalization.GetString(
+                PlasticLocalization.Name.FilterRulesConfirmationTitle));
+
+            Paragraph(mDialogExplanation);
+
+            RulesArea();
+
+            GUILayout.Space(20);
+
+            DoButtonsArea();
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.FilterRulesConfirmationTitle);
+        }
+
+        void RulesArea()
+        {
+            mScrollPosition = EditorGUILayout.BeginScrollView(mScrollPosition);
+
+            mRulesText = EditorGUILayout.TextArea(
+                mRulesText, GUILayout.ExpandHeight(true));
+
+            mIsTextAreaFocused = FixTextAreaSelectionIfNeeded(mIsTextAreaFocused);
+
+            EditorGUILayout.EndScrollView();
+
+            if (!mIsApplicableToAllWorkspaces)
+                return;
+
+            mApplyRulesToAllWorkspace = EditorGUILayout.ToggleLeft(
+                PlasticLocalization.GetString(PlasticLocalization.Name.ApplyRulesToAllWorkspaceCheckButton),
+                mApplyRulesToAllWorkspace, GUILayout.Width(200));
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoOkButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoOkButton();
+            }
+        }
+
+        void DoOkButton()
+        {
+            if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.OkButton)))
+                return;
+
+            OkButtonAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        string[] GetRules()
+        {
+            if (string.IsNullOrEmpty(mRulesText))
+                return new string[0];
+
+            return mRulesText.Split(
+                Environment.NewLine.ToCharArray(),
+                StringSplitOptions.RemoveEmptyEntries);
+        }
+
+        static bool FixTextAreaSelectionIfNeeded(bool isTextAreaFocused)
+        {
+            TextEditor textEditor = typeof(EditorGUI)
+              .GetField("activeEditor", BindingFlags.Static | BindingFlags.NonPublic)
+              .GetValue(null) as TextEditor;
+
+            // text editor is null when it is not focused
+            if (textEditor == null)
+                return false;
+
+            // restore the selection the first time that has selected text
+            // because it is done automatically by Unity
+            if (isTextAreaFocused)
+                return true;
+
+            if (string.IsNullOrEmpty(textEditor.SelectedText))
+                return false;
+
+            textEditor.SelectNone();
+            textEditor.MoveTextEnd();
+            return true;
+        }
+
+        static string GetRulesText(string[] rules)
+        {
+            if (rules == null)
+                return string.Empty;
+
+            return string.Join(Environment.NewLine, rules)
+                 + Environment.NewLine;
+        }
+
+        static FilterRulesConfirmationDialog Create(
+            string explanation,
+            string rulesText,
+            bool isApplicableToAllWorkspaces)
+        {
+            var instance = CreateInstance<FilterRulesConfirmationDialog>();
+            instance.mDialogExplanation = explanation;
+            instance.mRulesText = rulesText;
+            instance.mIsApplicableToAllWorkspaces = isApplicableToAllWorkspaces;
+            instance.mEnterKeyAction = instance.OkButtonAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            return instance;
+        }
+
+        bool mIsTextAreaFocused;
+        Vector2 mScrollPosition;
+
+        bool mApplyRulesToAllWorkspace;
+
+        bool mIsApplicableToAllWorkspaces;
+        string mRulesText;
+        string mDialogExplanation;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/FilterRulesConfirmationDialog.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/FilterRulesConfirmationDialog.cs.meta
new file mode 100644
index 0000000..4420f67
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/FilterRulesConfirmationDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 45d03e5c984da3448b417289e95e4291
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchCheckinConflictsDialog.cs b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchCheckinConflictsDialog.cs
new file mode 100644
index 0000000..6ee29ab
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchCheckinConflictsDialog.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+using UnityEditor;
+
+using Codice.Client.GameUI.Checkin;
+using GluonGui.Dialog;
+using GluonGui.WorkspaceWindow.Views.Checkin.Operations;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs
+{
+    internal class LaunchCheckinConflictsDialog : CheckinUIOperation.ICheckinConflictsDialog
+    {
+        internal LaunchCheckinConflictsDialog(EditorWindow window)
+        {
+            mWindow = window;
+        }
+
+        Result CheckinUIOperation.ICheckinConflictsDialog.Show(
+            IList<CheckinConflict> conflicts,
+            PlasticLocalization.Name dialogTitle,
+            PlasticLocalization.Name dialogExplanation,
+            PlasticLocalization.Name okButtonCaption)
+        {
+            ResponseType responseType = CheckinConflictsDialog.Show(
+                conflicts, dialogTitle, dialogExplanation,
+                okButtonCaption, mWindow);
+
+            return responseType == ResponseType.Ok ?
+                Result.Ok : Result.Cancel;
+        }
+
+        EditorWindow mWindow;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchCheckinConflictsDialog.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchCheckinConflictsDialog.cs.meta
new file mode 100644
index 0000000..6eec185
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchCheckinConflictsDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0caf9dda3147e224daf41ba5bd5cfaf0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchDependenciesDialog.cs b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchDependenciesDialog.cs
new file mode 100644
index 0000000..bc1a0cb
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchDependenciesDialog.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+using UnityEditor;
+
+using Codice.Client.BaseCommands;
+using Codice.CM.Common;
+using GluonGui.WorkspaceWindow.Views.Checkin.Operations;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs
+{
+    internal class LaunchDependenciesDialog : DependenciesHandler.IDependenciesDialog
+    {
+        internal LaunchDependenciesDialog(string operation, EditorWindow parentWindow)
+        {
+            mOperation = operation;
+            mParentWindow = parentWindow;
+        }
+
+        bool DependenciesHandler.IDependenciesDialog.IncludeDependencies(
+            WorkspaceInfo wkInfo, IList<ChangeDependencies<ChangeInfo>> dependencies)
+        {
+            return DependenciesDialog.IncludeDependencies(
+                wkInfo, dependencies, mOperation, mParentWindow);
+        }
+
+        string mOperation;
+        EditorWindow mParentWindow;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchDependenciesDialog.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchDependenciesDialog.cs.meta
new file mode 100644
index 0000000..46d671e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/LaunchDependenciesDialog.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3ccc9b689652f0b40b53c731af81f034
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/PendingChangesOptionsDialog.cs b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/PendingChangesOptionsDialog.cs
new file mode 100644
index 0000000..2ae3c86
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/PendingChangesOptionsDialog.cs
@@ -0,0 +1,584 @@
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.Commands;
+using Codice.Client.Common.FsNodeReaders;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using Codice.Utils;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs
+{
+    internal class PendingChangesOptionsDialog : PlasticDialog
+    {
+        internal interface IAutorefreshView
+        {
+            void DisableAutorefresh();
+            void EnableAutorefresh();
+        }
+
+        protected override Rect DefaultRect
+        {
+            get
+            {
+                var baseRect = base.DefaultRect;
+                return new Rect(baseRect.x, baseRect.y, 667, 660);
+            }
+        }
+
+        internal static void ChangeOptions(
+            WorkspaceInfo wkInfo,
+            IRefreshableView view,
+            IAutorefreshView autorefreshView,
+            EditorWindow window)
+        {
+            PendingChangesOptionsDialog dialog = Build(wkInfo);
+
+            autorefreshView.DisableAutorefresh();
+
+            bool isDialogDirty = false;
+
+            try
+            {
+                if (dialog.RunModal(window) != ResponseType.Ok)
+                    return;
+
+                PendingChangesOptions currentOptions = dialog.GetOptions();
+                isDialogDirty = dialog.IsDirty(currentOptions);
+
+                if (!isDialogDirty)
+                    return;
+
+                currentOptions.SavePreferences();
+            }
+            finally
+            {
+                autorefreshView.EnableAutorefresh();
+
+                if (isDialogDirty)
+                    view.Refresh();
+            }
+        }
+
+        protected override void OnModalGUI()
+        {
+            DoToolbarArea();
+
+            DoOptionsArea();
+
+            DoButtonsArea();
+        }
+
+        protected override string GetTitle()
+        {
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesOptionsTitle);
+        }
+
+        void DoToolbarArea()
+        {
+            var toolbarRect = GUILayoutUtility.GetRect(0, position.width, BOX_TOOLBAR_HEIGHT, BOX_TOOLBAR_HEIGHT);
+            GUI.Box(new Rect(toolbarRect.x, toolbarRect.y + toolbarRect.height / 2, toolbarRect.width, BOX_HEIGHT), GUIContent.none);
+
+            EditorGUI.BeginChangeCheck();
+
+            mSelectedTab = (Tab)GUI.Toolbar(toolbarRect, (int)mSelectedTab, new string[]{
+                PlasticLocalization.GetString(PlasticLocalization.Name.PendingChangesWhatToFindTab),
+                PlasticLocalization.GetString(PlasticLocalization.Name.PendingChangesWhatToShowTab),
+                PlasticLocalization.GetString(PlasticLocalization.Name.PendingChangesMoveDetectionTab)});
+
+            if (EditorGUI.EndChangeCheck())
+                EditorGUIUtility.keyboardControl = -1;
+        }
+
+        void DoOptionsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(BOX_PADDING);
+
+                using (new EditorGUILayout.VerticalScope(GUILayout.Height(BOX_HEIGHT)))
+                {
+                    GUILayout.Space(BOX_PADDING);
+
+                    switch (mSelectedTab)
+                    {
+                        case Tab.WhatToFind:
+                            DoWhatToFindTab();
+                            break;
+                        case Tab.WhatToShow:
+                            DoWhatToShowTab();
+                            break;
+                        case Tab.MoveDetection:
+                            DoMoveDetectionTab();
+                            break;
+                    }
+
+                    GUILayout.Space(BOX_PADDING);
+                }
+
+                GUILayout.Space(BOX_PADDING);
+            }
+        }
+
+        void DoWhatToFindTab()
+        {
+            mCanShowCheckouts = TitleToggle(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesShowCheckouts), mCanShowCheckouts);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesShowCheckoutsExplanation));
+            }
+
+            GUILayout.Space(5);
+
+            mCanFindChanged = TitleToggle(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesFindChanged), mCanFindChanged);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesFindChangedExplanation));
+            }
+
+            GUILayout.Space(5);
+
+            mCanCheckFileContent = TitleToggle(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesCheckFileContent), mCanCheckFileContent);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesCheckFileContentExplanation));
+            }
+
+            GUILayout.Space(60);
+            DoFsWatcherMessage(mIsFileSystemWatcherEnabled);
+        }
+
+        void DoWhatToShowTab()
+        {
+            mCanAutoRefresh = TitleToggle(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesAutoRefresh), mCanAutoRefresh);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesAutoRefreshExplanation));
+            }
+
+            GUILayout.Space(5);
+
+            mCanShowPrivateFields = TitleToggle(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesShowPrivateFiles), mCanShowPrivateFields);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesShowPrivateFilesExplanation));
+            }
+
+            GUILayout.Space(5);
+
+            mCanShowIgnoredFiles = TitleToggle(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesShowIgnoredFiles), mCanShowIgnoredFiles);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesShowIgnoredFilesExplanation));
+            }
+
+            GUILayout.Space(5);
+
+            mCanShowHiddenFiles = TitleToggle(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesShowHiddenFiles), mCanShowHiddenFiles);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesShowHiddenFilesExplanation));
+            }
+
+            GUILayout.Space(5);
+
+            mCanShowDeletedFiles = TitleToggle(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesShowDeletedFiles), mCanShowDeletedFiles);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesShowDeletedFilesExplanation));
+            }
+        }
+
+        void DoMoveDetectionTab()
+        {
+            Paragraph(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesMoveDetectionExplanation));
+
+            mCanFindMovedFiles = TitleToggle(PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesFindMovedFiles), mCanFindMovedFiles);
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesFindMovedFilesExplanation));
+            }
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesMoveDetectionFineTune));
+            }
+
+            GUILayout.Space(5);
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+
+                GUI.enabled = mCanFindMovedFiles;
+
+                mCanMatchBinarySameExtension = TitleToggle(
+                    PlasticLocalization.GetString(
+                        PlasticLocalization.Name.PendingChangesMatchBinarySameExtension),
+                    mCanMatchBinarySameExtension);
+
+                GUI.enabled = true;
+            }
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(40);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesMatchBinarySameExtensionExplanation));
+            }
+
+            GUILayout.Space(5);
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+
+                GUI.enabled = mCanFindMovedFiles;
+
+                mCanMatchTextSameExtension = TitleToggle(
+                    PlasticLocalization.GetString(
+                        PlasticLocalization.Name.PendingChangesMatchTextSameExtension),
+                    mCanMatchTextSameExtension);
+
+                GUI.enabled = true;
+            }
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(40);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesMatchTextSameExtensionExplanation));
+            }
+
+            GUILayout.Space(5);
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(20);
+                GUILayout.Label(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesSimilarityPercentage),
+                    UnityStyles.Dialog.Toggle);
+                GUILayout.FlexibleSpace();
+                using (new EditorGUILayout.VerticalScope())
+                {
+                    GUILayout.Space(8);
+                    mSimilarityPercent = Mathf.RoundToInt(GUILayout.HorizontalSlider(
+                        mSimilarityPercent, 40, 100, GUILayout.Width(300)));
+
+                }
+                GUILayout.Space(2);
+                using (new EditorGUILayout.VerticalScope())
+                {
+                    GUILayout.Space(8);
+                    GUILayout.Label(mSimilarityPercent + "%");
+                }
+            }
+
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.Space(40);
+                Paragraph(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesSimilarityPercentageExplanation));
+            }
+        }
+
+        void DoFsWatcherMessage(bool isEnabled)
+        {
+            GUIContent message = new GUIContent(
+                isEnabled ?
+                    GetFsWatcherEnabledMessage() :
+                    GetFsWatcherDisabledMessage(),
+                isEnabled ?
+                    Images.GetInfoIcon() :
+                    Images.GetWarnIcon());
+
+            GUILayout.Label(message, UnityStyles.Dialog.Toggle, GUILayout.Height(32));
+            GUILayout.Space(-10);
+
+            string formattedExplanation = isEnabled ?
+                GetFsWatcherEnabledExplanation():
+                GetFsWatcherDisabledExplanation();
+
+            string helpLink = GetHelpLink();
+
+            TextBlockWithEndLink(
+                helpLink, formattedExplanation, UnityStyles.Paragraph);
+        }
+
+        void DoButtonsArea()
+        {
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+
+                if (Application.platform == RuntimePlatform.WindowsEditor)
+                {
+                    DoOkButton();
+                    DoCancelButton();
+                    return;
+                }
+
+                DoCancelButton();
+                DoOkButton();
+            }
+        }
+
+        void DoOkButton()
+        {
+            if (!AcceptButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.OkButton)))
+                return;
+
+            OkButtonAction();
+        }
+
+        void DoCancelButton()
+        {
+            if (!NormalButton(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.CancelButton)))
+                return;
+
+            CancelButtonAction();
+        }
+
+        bool IsDirty(PendingChangesOptions currentOptions)
+        {
+            return !mInitialOptions.AreSameOptions(currentOptions);
+        }
+
+        PendingChangesOptions GetOptions()
+        {
+            WorkspaceStatusOptions resultWkStatusOptions =
+                WorkspaceStatusOptions.None;
+
+            if (mCanShowCheckouts)
+            {
+                resultWkStatusOptions |= WorkspaceStatusOptions.FindCheckouts;
+                resultWkStatusOptions |= WorkspaceStatusOptions.FindReplaced;
+                resultWkStatusOptions |= WorkspaceStatusOptions.FindCopied;
+            }
+
+            if (mCanFindChanged)
+                resultWkStatusOptions |= WorkspaceStatusOptions.FindChanged;
+            if (mCanShowPrivateFields)
+                resultWkStatusOptions |= WorkspaceStatusOptions.FindPrivates;
+            if (mCanShowDeletedFiles)
+                resultWkStatusOptions |= WorkspaceStatusOptions.FindLocallyDeleted;
+            if (mCanShowIgnoredFiles)
+                resultWkStatusOptions |= WorkspaceStatusOptions.ShowIgnored;
+            if (mCanShowHiddenFiles)
+                resultWkStatusOptions |= WorkspaceStatusOptions.ShowHiddenChanges;
+            if (mCanFindMovedFiles)
+                resultWkStatusOptions |= WorkspaceStatusOptions.CalculateLocalMoves;
+
+            MovedMatchingOptions matchingOptions = new MovedMatchingOptions();
+            matchingOptions.AllowedChangesPerUnit =
+                (100 - mSimilarityPercent) / 100f;
+            matchingOptions.bBinMatchingOnlySameExtension =
+                mCanMatchBinarySameExtension;
+            matchingOptions.bTxtMatchingOnlySameExtension =
+                mCanMatchTextSameExtension;
+
+            return new PendingChangesOptions(
+                resultWkStatusOptions, matchingOptions,
+                mCanAutoRefresh, false,
+                mCanCheckFileContent, false);
+        }
+
+        void SetOptions(PendingChangesOptions options)
+        {
+            mCanShowCheckouts = IsEnabled(
+                WorkspaceStatusOptions.FindCheckouts, options.WorkspaceStatusOptions);
+            mCanFindChanged = IsEnabled(
+                WorkspaceStatusOptions.FindChanged, options.WorkspaceStatusOptions);
+            mCanCheckFileContent = options.CheckFileContentForChanged;
+
+            mCanAutoRefresh = options.AutoRefresh;
+            mCanShowPrivateFields = IsEnabled(
+                WorkspaceStatusOptions.FindPrivates, options.WorkspaceStatusOptions);
+            mCanShowIgnoredFiles = IsEnabled(
+                WorkspaceStatusOptions.ShowIgnored, options.WorkspaceStatusOptions);
+            mCanShowHiddenFiles = IsEnabled(
+                WorkspaceStatusOptions.ShowHiddenChanges, options.WorkspaceStatusOptions);
+            mCanShowDeletedFiles = IsEnabled(
+                WorkspaceStatusOptions.FindLocallyDeleted, options.WorkspaceStatusOptions);
+
+            mCanFindMovedFiles = IsEnabled(
+                WorkspaceStatusOptions.CalculateLocalMoves, options.WorkspaceStatusOptions);
+            mCanMatchBinarySameExtension =
+                options.MovedMatchingOptions.bBinMatchingOnlySameExtension;
+            mCanMatchTextSameExtension =
+                options.MovedMatchingOptions.bTxtMatchingOnlySameExtension;
+            mSimilarityPercent = (int)((1 - options.MovedMatchingOptions.AllowedChangesPerUnit) * 100f);
+        }
+
+        void CheckFsWatcher(WorkspaceInfo wkInfo)
+        {
+            bool isFileSystemWatcherEnabled = false;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    isFileSystemWatcherEnabled =
+                        IsFileSystemWatcherEnabled(wkInfo);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    if (waiter.Exception != null)
+                        return;
+
+                    mIsFileSystemWatcherEnabled = isFileSystemWatcherEnabled;
+                });
+        }
+
+        static bool IsEnabled(WorkspaceStatusOptions option, WorkspaceStatusOptions options)
+        {
+            return (options & option) == option;
+        }
+
+        static bool IsFileSystemWatcherEnabled(WorkspaceInfo wkInfo)
+        {
+            return WorkspaceWatcherFsNodeReadersCache.Get().
+                IsWatcherEnabled(wkInfo);
+        }
+
+        static string GetFsWatcherEnabledMessage()
+        {
+            if (PlatformIdentifier.IsWindows() || PlatformIdentifier.IsMac())
+                return PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesFilesystemWatcherEnabled);
+
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesINotifyEnabled);
+        }
+
+        static string GetFsWatcherDisabledMessage()
+        {
+            if (PlatformIdentifier.IsWindows() || PlatformIdentifier.IsMac())
+                return PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesFilesystemWatcherDisabled);
+
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesINotifyDisabled);
+        }
+
+        static string GetFsWatcherEnabledExplanation()
+        {
+            if (PlatformIdentifier.IsWindows() || PlatformIdentifier.IsMac())
+                return PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesFilesystemWatcherEnabledExplanation);
+
+                return PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesINotifyEnabledExplanation);
+        }
+
+        static string GetFsWatcherDisabledExplanation()
+        {
+            if (PlatformIdentifier.IsWindows() || PlatformIdentifier.IsMac())
+            {
+                return PlasticLocalization.GetString(
+                    PlasticLocalization.Name.PendingChangesFilesystemWatcherDisabledExplanation)
+                    .Replace("[[HELP_URL|{0}]]", "{0}");
+            }
+
+            return PlasticLocalization.GetString(
+                PlasticLocalization.Name.PendingChangesINotifyDisabledExplanation);
+        }
+
+        static string GetHelpLink()
+        {
+            if (PlatformIdentifier.IsWindows() || PlatformIdentifier.IsMac())
+                return FS_WATCHER_HELP_URL;
+
+            return INOTIFY_HELP_URL;
+        }
+
+        static PendingChangesOptionsDialog Build(WorkspaceInfo wkInfo)
+        {
+            PendingChangesOptionsDialog result = Create();
+
+            result.CheckFsWatcher(wkInfo);
+
+            result.mInitialOptions = new PendingChangesOptions();
+            result.mInitialOptions.LoadPendingChangesOptions();
+            result.SetOptions(result.mInitialOptions);
+
+            return result;
+        }
+
+        static PendingChangesOptionsDialog Create()
+        {
+            var instance = CreateInstance<PendingChangesOptionsDialog>();
+            instance.mEnterKeyAction = instance.OkButtonAction;
+            instance.mEscapeKeyAction = instance.CancelButtonAction;
+            return instance;
+        }
+
+        enum Tab
+        {
+            WhatToFind,
+            WhatToShow,
+            MoveDetection
+        }
+
+        Tab mSelectedTab = Tab.WhatToFind;
+
+        bool mCanShowCheckouts;
+        bool mCanAutoRefresh;
+        bool mCanFindChanged;
+        bool mCanCheckFileContent;
+        bool mCanShowPrivateFields;
+        bool mIsFileSystemWatcherEnabled;
+        bool mCanShowIgnoredFiles;
+        bool mCanShowHiddenFiles;
+        bool mCanShowDeletedFiles;
+        bool mCanFindMovedFiles;
+        bool mCanMatchBinarySameExtension;
+        bool mCanMatchTextSameExtension;
+        int mSimilarityPercent;
+
+        PendingChangesOptions mInitialOptions;
+
+        const float BOX_PADDING = 22f;
+        const float BOX_TOOLBAR_HEIGHT = 20f;
+        const float BOX_HEIGHT = 560f;
+
+        const string FS_WATCHER_HELP_URL = "https://plasticscm.com/download/help/support";
+        const string INOTIFY_HELP_URL = "https://plasticscm.com/download/help/inotify";
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/Dialogs/PendingChangesOptionsDialog.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/PendingChangesOptionsDialog.cs.meta
new file mode 100644
index 0000000..2d93246
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/Dialogs/PendingChangesOptionsDialog.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: dfe63d839190b4d8392b6d6ac6edeae8
+timeCreated: 1541765192
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/DrawCommentTextArea.cs b/Editor/PlasticSCM/Views/PendingChanges/DrawCommentTextArea.cs
new file mode 100644
index 0000000..2d042d6
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/DrawCommentTextArea.cs
@@ -0,0 +1,112 @@
+using System.Reflection;
+
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    static class DrawCommentTextArea
+    {
+        internal static void For(
+            PlasticGUIClient plasticClient,
+            float width,
+            bool isOperationRunning)
+        {
+            using (new GuiEnabled(!isOperationRunning))
+            {
+                EditorGUILayout.BeginHorizontal();
+
+                Rect textAreaRect = BuildTextAreaRect(
+                    plasticClient.CommentText, width);
+
+                EditorGUI.BeginChangeCheck();
+
+                plasticClient.CommentText = DoTextArea(
+                    plasticClient.CommentText ?? string.Empty,
+                    plasticClient.ForceToShowComment,
+                    textAreaRect);
+
+                plasticClient.ForceToShowComment = false;
+
+                if (EditorGUI.EndChangeCheck())
+                    OnTextAreaChanged(plasticClient, plasticClient.CommentText);
+
+                if (string.IsNullOrEmpty(plasticClient.CommentText))
+                {
+                    DoPlaceholderIfNeeded(PlasticLocalization.GetString(
+                        PlasticLocalization.Name.CheckinComment), textAreaRect);
+                }
+
+                EditorGUILayout.EndHorizontal();
+            }
+        }
+
+        static void OnTextAreaChanged(PlasticGUIClient plasticClient, string text)
+        {
+            plasticClient.UpdateIsCommentWarningNeeded(text);
+        }
+
+        static string DoTextArea(string text, bool forceToShowText, Rect textAreaRect)
+        {
+            // while the text area has the focus, the changes to 
+            // the source string will not be picked up by the text editor. 
+            // so, when we want to change the text programmatically
+            // we have to remove the focus, set the text and then reset the focus.
+
+            TextEditor textEditor = typeof(EditorGUI)
+                .GetField("activeEditor", BindingFlags.Static | BindingFlags.NonPublic)
+                .GetValue(null) as TextEditor;
+
+            bool shouldBeFocusFixed = forceToShowText && textEditor != null;
+
+            if (shouldBeFocusFixed)
+                EditorGUIUtility.keyboardControl = 0;
+
+            text = EditorGUI.TextArea(
+                textAreaRect, text, EditorStyles.textArea);
+
+            if (shouldBeFocusFixed)
+                EditorGUIUtility.keyboardControl = textEditor.controlID;
+
+            return text;
+        }
+
+        static void DoPlaceholderIfNeeded(string placeholder, Rect textAreaRect)
+        {
+            int textAreaControlId = GUIUtility.GetControlID(FocusType.Passive) - 1;
+
+            if (EditorGUIUtility.keyboardControl == textAreaControlId)
+                return;
+
+            Rect hintRect = textAreaRect;
+            hintRect.height = EditorStyles.textArea.lineHeight;
+
+            GUI.Label(hintRect, placeholder,
+                UnityStyles.PendingChangesTab.CommentPlaceHolder);
+        }
+
+        static Rect BuildTextAreaRect(string text, float width)
+        {
+            GUIStyle commentTextAreaStyle =
+                UnityStyles.PendingChangesTab.CommentTextArea;
+
+            float contentWidth = width -
+                commentTextAreaStyle.margin.left -
+                commentTextAreaStyle.margin.right;
+
+            float requiredHeight = commentTextAreaStyle
+                .CalcHeight(new GUIContent(text), contentWidth);
+
+            Rect result = GUILayoutUtility.GetRect(
+                contentWidth, Mathf.Max(requiredHeight, 42));
+            result.x += commentTextAreaStyle.margin.left;
+            result.width = contentWidth;
+            result.height = Mathf.Max(result.height, 42);
+
+            return result;
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/DrawCommentTextArea.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/DrawCommentTextArea.cs.meta
new file mode 100644
index 0000000..c6256fc
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/DrawCommentTextArea.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 23471c5c18843794fba363cb093b5a05
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/FilesFilterPatternsMenuBuilder.cs b/Editor/PlasticSCM/Views/PendingChanges/FilesFilterPatternsMenuBuilder.cs
new file mode 100644
index 0000000..fb50b57
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/FilesFilterPatternsMenuBuilder.cs
@@ -0,0 +1,192 @@
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.Items;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal interface IFilesFilterPatternsMenuOperations
+    {
+        void AddFilesFilterPatterns(
+            FilterTypes type, FilterActions action, FilterOperationType operation);
+    }
+
+    internal class FilesFilterPatternsMenuBuilder
+    {
+        internal FilesFilterPatternsMenuBuilder(IFilesFilterPatternsMenuOperations operations)
+        {
+            mOperations = operations;
+        }
+
+        internal void BuildIgnoredSubmenuItem()
+        {
+            mIgnoredSubmenuItem = new GUIContent(string.Empty);
+            mIgnoredByNameMenuItemContent = new GUIContent(string.Empty);
+            mIgnoredByExtensionMenuItemContent = new GUIContent(string.Empty);
+            mIgnoredByFullPathMenuItemContent = new GUIContent(string.Empty);
+        }
+
+        internal void BuildHiddenChangesSubmenuItem()
+        {
+            mHiddenChangesSubmenuItem = new GUIContent(string.Empty);
+            mHiddenChangesByNameMenuItemContent = new GUIContent(string.Empty);
+            mHiddenChangesByExtensionMenuItemContent = new GUIContent(string.Empty);
+            mHiddenChangesByFullPathMenuItemContent = new GUIContent(string.Empty);
+        }
+
+        internal void UpdateMenuItems(GenericMenu menu, FilterMenuActions actions)
+        {
+            if (mIgnoredSubmenuItem != null)
+                UpdateIgnoredMenuItems(menu, actions.Operations);
+
+            if (mHiddenChangesSubmenuItem != null)
+                UpdateHiddenChangesMenuItems(menu, actions.Operations);
+
+            SetFilterMenuItemsLabels(actions);
+        }
+
+        void UpdateIgnoredMenuItems(GenericMenu menu, FilterMenuOperations operations)
+        {
+            if (!operations.HasFlag(FilterMenuOperations.Ignore))
+            {
+                menu.AddDisabledItem(mIgnoredSubmenuItem);
+                return;
+            }
+
+            menu.AddItem(mIgnoredByNameMenuItemContent, false, IgnoredByName_Click);
+            menu.AddItem(mIgnoredByExtensionMenuItemContent, false, IgnoredByExtension_Click);
+
+            if (!operations.HasFlag(FilterMenuOperations.IgnoreByExtension))
+                return;
+
+            menu.AddItem(mIgnoredByFullPathMenuItemContent, false, IgnoredByFullPath_Click);
+        }
+
+        void UpdateHiddenChangesMenuItems(GenericMenu menu, FilterMenuOperations operations)
+        {
+            if (!operations.HasFlag(FilterMenuOperations.HideChanged))
+            {
+                menu.AddDisabledItem(mHiddenChangesSubmenuItem);
+                return;
+            }
+
+            menu.AddItem(mHiddenChangesByNameMenuItemContent, false, HiddenChangesByName_Click);
+            menu.AddItem(mHiddenChangesByExtensionMenuItemContent, false, HiddenChangesByExtension_Click);
+
+            if (!operations.HasFlag(FilterMenuOperations.HideChangedByExtension))
+                return;
+
+            menu.AddItem(mHiddenChangesByFullPathMenuItemContent, false, HiddenChangesByFullPath_Click);
+        }
+
+        void IgnoredByName_Click()
+        {
+            mOperations.AddFilesFilterPatterns(
+                FilterTypes.Ignored, FilterActions.ByName,
+                GetIgnoredFilterOperationType());
+        }
+
+        void IgnoredByExtension_Click()
+        {
+            mOperations.AddFilesFilterPatterns(
+                FilterTypes.Ignored, FilterActions.ByExtension,
+                GetIgnoredFilterOperationType());
+        }
+
+        void IgnoredByFullPath_Click()
+        {
+            mOperations.AddFilesFilterPatterns(
+                FilterTypes.Ignored, FilterActions.ByFullPath,
+                GetIgnoredFilterOperationType());
+        }
+
+        void HiddenChangesByName_Click()
+        {
+            mOperations.AddFilesFilterPatterns(
+                FilterTypes.HiddenChanges, FilterActions.ByName,
+                GetHiddenChangesFilterOperationType());
+        }
+
+        void HiddenChangesByExtension_Click()
+        {
+            mOperations.AddFilesFilterPatterns(
+                FilterTypes.HiddenChanges, FilterActions.ByExtension,
+                GetHiddenChangesFilterOperationType());
+        }
+
+        void HiddenChangesByFullPath_Click()
+        {
+            mOperations.AddFilesFilterPatterns(
+                FilterTypes.HiddenChanges, FilterActions.ByFullPath,
+                GetHiddenChangesFilterOperationType());
+        }
+
+        FilterOperationType GetIgnoredFilterOperationType()
+        {
+            if (mIgnoredByNameMenuItemContent.text.StartsWith(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.MenuAddToIgnoreList)))
+            {
+                return FilterOperationType.Add;
+            }
+
+            return FilterOperationType.Remove;
+        }
+
+        FilterOperationType GetHiddenChangesFilterOperationType()
+        {
+            if (mHiddenChangesByNameMenuItemContent.text.StartsWith(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.MenuAddToHiddenChangesList)))
+            {
+                return FilterOperationType.Add;
+            }
+
+            return FilterOperationType.Remove;
+        }
+
+        void SetFilterMenuItemsLabels(FilterMenuActions actions)
+        {
+            if (mIgnoredSubmenuItem != null)
+            {
+                mIgnoredSubmenuItem.text = actions.IgnoredTitle;
+                mIgnoredByNameMenuItemContent.text = GetSubMenuText(
+                    actions.IgnoredTitle, actions.FilterByName);
+                mIgnoredByExtensionMenuItemContent.text = GetSubMenuText(
+                    actions.IgnoredTitle, actions.FilterByExtension);
+                mIgnoredByFullPathMenuItemContent.text = GetSubMenuText(
+                    actions.IgnoredTitle, actions.FilterByFullPath);
+            }
+
+            if (mHiddenChangesSubmenuItem != null)
+            {
+                mHiddenChangesSubmenuItem.text = actions.HiddenChangesTitle;
+                mHiddenChangesByNameMenuItemContent.text = GetSubMenuText(
+                    actions.HiddenChangesTitle, actions.FilterByName);
+                mHiddenChangesByExtensionMenuItemContent.text = GetSubMenuText(
+                    actions.HiddenChangesTitle, actions.FilterByExtension);
+                mHiddenChangesByFullPathMenuItemContent.text = GetSubMenuText(
+                    actions.HiddenChangesTitle, actions.FilterByFullPath);
+            }
+        }
+
+        static string GetSubMenuText(string menuName, string subMenuName)
+        {
+            return string.Format("{0}/{1}", menuName, subMenuName.Replace('/', '\\'));
+        }
+
+        GUIContent mIgnoredSubmenuItem;
+        GUIContent mHiddenChangesSubmenuItem;
+
+        GUIContent mIgnoredByNameMenuItemContent;
+        GUIContent mHiddenChangesByNameMenuItemContent;
+
+        GUIContent mIgnoredByExtensionMenuItemContent;
+        GUIContent mHiddenChangesByExtensionMenuItemContent;
+
+        GUIContent mIgnoredByFullPathMenuItemContent;        
+        GUIContent mHiddenChangesByFullPathMenuItemContent;
+
+        IFilesFilterPatternsMenuOperations mOperations;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/FilesFilterPatternsMenuBuilder.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/FilesFilterPatternsMenuBuilder.cs.meta
new file mode 100644
index 0000000..bd7b843
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/FilesFilterPatternsMenuBuilder.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 05d31e83a4093e448b45616d62a12790
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesMultiColumnHeader.cs b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesMultiColumnHeader.cs
new file mode 100644
index 0000000..0a82772
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesMultiColumnHeader.cs
@@ -0,0 +1,99 @@
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui.WorkspaceWindow.PendingChanges;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal class PendingChangesMultiColumnHeader : MultiColumnHeader
+    {
+        internal PendingChangesMultiColumnHeader(
+            MultiColumnHeaderState headerState, UnityPendingChangesTree tree)
+            : base(headerState)
+        {
+            mPendingChangesTree = tree;
+        }
+
+        protected override void ColumnHeaderGUI(MultiColumnHeaderState.Column column, Rect headerRect, int columnIndex)
+        {
+            if (columnIndex == 0)
+            {
+                bool checkAllWasMixed = IsMixedCheckedState();
+                bool checkAllWasTrue = IsAllCheckedState();
+
+                var checkRect = new Rect(
+                    headerRect.x + UnityConstants.TREEVIEW_BASE_INDENT,
+                    headerRect.y + 3 + UnityConstants.TREEVIEW_HEADER_CHECKBOX_Y_OFFSET,  // Custom offset because header labels are not centered
+                    UnityConstants.TREEVIEW_CHECKBOX_SIZE,
+                    headerRect.height);
+                
+                EditorGUI.showMixedValue = checkAllWasMixed;
+                bool checkAllIsTrue = EditorGUI.Toggle(
+                    checkRect,
+                    checkAllWasTrue);
+                EditorGUI.showMixedValue = false;
+
+                if (checkAllWasTrue != checkAllIsTrue)
+                {
+                    UpdateCheckedState(checkAllIsTrue);
+                }
+
+                headerRect.x = checkRect.xMax;
+            }
+
+            base.ColumnHeaderGUI(column, headerRect, columnIndex);
+        }
+
+        internal bool IsAllCheckedState()
+        {
+            List<PendingChangeCategory> categories = mPendingChangesTree.GetNodes();
+
+            if (categories == null)
+                return false;
+
+            foreach (PendingChangeCategory category in categories)
+            {
+                if (!category.IsChecked())
+                    return false;
+            }
+
+            return true;
+        }
+
+        protected bool IsMixedCheckedState()
+        {
+            List<PendingChangeCategory> categories = mPendingChangesTree.GetNodes();
+
+            if (categories == null)
+                return false;
+
+            if (IsAllCheckedState())
+                return false;
+
+            foreach (PendingChangeCategory category in categories)
+            {
+                if (category.GetCheckedChangesCount() > 0)
+                    return true;
+            }
+
+            return false;
+        }
+
+        internal void UpdateCheckedState(bool isChecked)
+        {
+            List<PendingChangeCategory> categories = mPendingChangesTree.GetNodes();
+
+            if (categories == null)
+                return;
+
+            foreach (PendingChangeCategory category in categories)
+                category.UpdateCheckedState(isChecked);
+        }
+
+        protected UnityPendingChangesTree mPendingChangesTree;
+    }
+}
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesMultiColumnHeader.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesMultiColumnHeader.cs.meta
new file mode 100644
index 0000000..6f0b844
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesMultiColumnHeader.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e7b15873dbe9463cad67af4fac8e41ba
+timeCreated: 1589491970
\ No newline at end of file
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesSelection.cs b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesSelection.cs
new file mode 100644
index 0000000..c5dd704
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesSelection.cs
@@ -0,0 +1,131 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using PlasticGui.WorkspaceWindow.Diff;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal static class PendingChangesSelection
+    {
+        internal static void SelectChanges(
+            PendingChangesTreeView treeView,
+            List<ChangeInfo> changesToSelect)
+        {
+            if (changesToSelect == null || changesToSelect.Count == 0)
+            {
+                treeView.SelectFirstPendingChangeOnTree();
+                return;
+            }
+
+            treeView.SelectPreviouslySelectedPendingChanges(changesToSelect);
+
+            if (treeView.HasSelection())
+                return;
+
+            treeView.SelectFirstPendingChangeOnTree();
+        }
+
+        internal static List<string> GetSelectedPathsWithoutMeta(
+            PendingChangesTreeView treeView)
+        {
+            return treeView.GetSelectedChanges(false)
+                .Select(change => change.GetFullPath()).ToList();
+        }
+
+        internal static List<string> GetSelectedPaths(
+            PendingChangesTreeView treeView)
+        {
+            return treeView.GetSelectedChanges(true)
+                .Select(change => change.GetFullPath()).ToList();
+        }
+
+        internal static List<string> GetSelectedMetaPaths(
+            PendingChangesTreeView treeView)
+        {
+            List<ChangeInfo> selectedChanges = PendingChangesSelection
+                .GetSelectedChanges(treeView);
+
+            List<string> result = new List<string>();
+
+            foreach (ChangeInfo change in selectedChanges)
+            {
+                string path = change.GetFullPath();
+
+                if (!MetaPath.IsMetaPath(path))
+                    continue;
+
+                result.Add(path);
+            }
+
+            return result;
+        }
+
+        internal static List<ChangeInfo> GetAllChanges(
+            PendingChangesTreeView treeView)
+        {
+            return treeView.GetAllChanges();
+        }
+
+        internal static List<ChangeInfo> GetChangesToFocus(
+            PendingChangesTreeView treeView)
+        {
+            List<ChangeInfo> selectedChanges = treeView.GetSelectedChanges(true);
+
+            if (selectedChanges.Count == 0)
+                return selectedChanges;
+
+            List<ChangeInfo> changesToFocus =
+                selectedChanges.Where(change => !IsAddedFile(change)).ToList();
+
+            if (changesToFocus.Count() == 0)
+            {
+                ChangeInfo nearestAddedChange = treeView.GetNearestAddedChange();
+                if (nearestAddedChange != null)
+                    changesToFocus.Add(nearestAddedChange);
+            }
+
+            return changesToFocus;
+        }
+
+        internal static SelectedChangesGroupInfo GetSelectedChangesGroupInfo(
+            PendingChangesTreeView treeView)
+        {
+            SelectedChangesGroupInfo result = treeView.GetSelectedChangesGroupInfo();
+            result.IsApplicableDiffWorkspaceContent = IsApplicableDiffWorkspaceContent(treeView);
+            return result;
+        }
+
+        internal static List<ChangeInfo> GetSelectedChanges(
+            PendingChangesTreeView treeView)
+        {
+            return treeView.GetSelectedChanges(true);
+        }
+
+        internal static ChangeInfo GetSelectedChange(
+            PendingChangesTreeView treeView)
+        {
+            return treeView.GetSelectedRow();
+        }
+
+        static bool IsApplicableDiffWorkspaceContent(
+            PendingChangesTreeView treeView)
+        {
+            ChangeInfo selectedRow = GetSelectedChange(treeView);
+
+            if (selectedRow == null)
+                return false;
+
+            return DiffOperation.IsApplicableDiffWorkspaceContent(selectedRow);
+        }
+
+        static bool IsAddedFile(ChangeInfo change)
+        {
+            return ChangeTypesClassifier.IsInAddedCategory(change.ChangeTypes)
+                && !(Directory.Exists(change.Path) || File.Exists(change.Path));
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesSelection.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesSelection.cs.meta
new file mode 100644
index 0000000..7b98bdf
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesSelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7a92174abe154af4b99e09e4b6cf31ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTab.cs b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTab.cs
new file mode 100644
index 0000000..1fb6a32
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTab.cs
@@ -0,0 +1,652 @@
+using System;
+using System.Collections.Generic;
+
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Common.FsNodeReaders;
+using Codice.Client.Common.Threading;
+using Codice.CM.Common;
+using Codice.LogWrapper;
+
+using PlasticGui;
+using PlasticGui.Help.Actions;
+using PlasticGui.Help.Conditions;
+using PlasticGui.WorkspaceWindow;
+using PlasticGui.WorkspaceWindow.Diff;
+using PlasticGui.WorkspaceWindow.Items;
+using PlasticGui.WorkspaceWindow.Open;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.Help;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.UI.Tree;
+using Unity.PlasticSCM.Editor.Views.PendingChanges.Dialogs;
+using Unity.PlasticSCM.Editor.Views.PendingChanges.PendingMergeLinks;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.AssetsOverlays;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal class PendingChangesTab :
+        IRefreshableView,
+        PendingChangesViewMenu.IMetaMenuOperations,
+        IPendingChangesMenuOperations,
+        IOpenMenuOperations,
+        IFilesFilterPatternsMenuOperations,
+        PendingChangesOptionsDialog.IAutorefreshView
+    {
+        internal IProgressControls ProgressControlsForTesting { get { return mProgressControls; } }
+        internal HelpPanel HelpPanelForTesting { get { return mHelpPanel; } }
+
+        internal PendingChangesTab(
+            WorkspaceInfo wkInfo,
+            PlasticGUIClient plasticClient,
+            bool isGluonMode,
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges,
+            NewIncomingChangesUpdater developerNewIncomingChangesUpdater,
+            IHistoryViewLauncher historyViewLauncher,
+            IAssetStatusCache assetStatusCache,
+            EditorWindow parentWindow)
+        {
+            mWkInfo = wkInfo;
+            mPlasticClient = plasticClient;
+            mIsGluonMode = isGluonMode;
+            mDeveloperNewIncomingChangesUpdater = developerNewIncomingChangesUpdater;
+            mPendingChanges = pendingChanges;
+            mHistoryViewLauncher = historyViewLauncher;
+            mAssetStatusCache = assetStatusCache;
+            mParentWindow = parentWindow;
+
+            mNewChangesInWk = NewChangesInWk.Build(
+                mWkInfo, new BuildWorkspacekIsRelevantNewChange());
+
+            BuildComponents(plasticClient, isGluonMode, parentWindow);
+
+            mProgressControls = new ProgressControlsForViews();
+
+            plasticClient.RegisterPendingChangesGuiControls(
+                mProgressControls,
+                mPendingChangesTreeView,
+                mMergeLinksListView);
+
+            InitIgnoreRulesAndRefreshView(mWkInfo.ClientPath, this);
+        }
+
+        internal void AutoRefresh()
+        {
+            if (mIsAutoRefreshDisabled)
+                return;
+
+            if (!PlasticGuiConfig.Get().Configuration.CommitAutoRefresh)
+                return;
+
+            if (mPlasticClient.IsRefreshing() || mPlasticClient.IsOperationInProgress())
+                return;
+
+            if (mNewChangesInWk != null && !mNewChangesInWk.Detected())
+                return;
+
+            ((IRefreshableView)this).Refresh();
+        }
+
+        internal void OnDisable()
+        {
+            mSearchField.downOrUpArrowKeyPressed -=
+                SearchField_OnDownOrUpArrowKeyPressed;
+
+            TreeHeaderSettings.Save(
+                mPendingChangesTreeView.multiColumnHeader.state,
+                UnityConstants.PENDING_CHANGES_TABLE_SETTINGS_NAME);
+        }
+
+        internal void Update()
+        {
+            mProgressControls.UpdateProgress(mParentWindow);
+        }
+
+        internal void OnGUI()
+        {
+            DrawCommentTextArea.For(
+                mPlasticClient,
+                mParentWindow.position.width,
+                mProgressControls.IsOperationRunning());
+
+            DoOperationsToolbar(
+                mPlasticClient,
+                mWkInfo,
+                mIsGluonMode,
+                mAdvancedDropdownMenu,
+                mProgressControls.IsOperationRunning());
+
+            if (!string.IsNullOrEmpty(mPlasticClient.GluonWarningMessage))
+                DoWarningMessage(mPlasticClient.GluonWarningMessage);
+
+            DoActionsToolbar(
+                mWkInfo,
+                mIsGluonMode,
+                this,
+                mProgressControls,
+                mParentWindow);
+
+            DoChangesArea(
+                mPendingChangesTreeView,
+                mProgressControls.IsOperationRunning());
+
+            if (mPlasticClient.HasPendingMergeLinks())
+                DoMergeLinksArea(mMergeLinksListView, mParentWindow.position.width);
+
+            if (mProgressControls.HasNotification())
+            {
+                DrawProgressForViews.ForNotificationArea(
+                    mProgressControls.ProgressData);
+            }
+
+            DrawHelpPanel.For(mHelpPanel);
+        }
+
+        void IRefreshableView.Refresh()
+        {
+            if (!mAreIgnoreRulesInitialized)
+                return;
+
+            DrawAssetOverlay.ClearCache();
+
+            mPlasticClient.GetPendingChanges(mNewChangesInWk);
+        }
+
+        void PendingChangesOptionsDialog.IAutorefreshView.DisableAutorefresh()
+        {
+            mIsAutoRefreshDisabled = true;
+        }
+
+        void PendingChangesOptionsDialog.IAutorefreshView.EnableAutorefresh()
+        {
+            mIsAutoRefreshDisabled = false;
+        }
+
+        bool PendingChangesViewMenu.IMetaMenuOperations.SelectionHasMeta()
+        {
+            return mPendingChangesTreeView.SelectionHasMeta();
+        }
+
+        void PendingChangesViewMenu.IMetaMenuOperations.DiffMeta()
+        {
+            ChangeInfo selectedChange = PendingChangesSelection
+                .GetSelectedChange(mPendingChangesTreeView);
+            ChangeInfo selectedChangeMeta = mPendingChangesTreeView.GetMetaChange(
+                selectedChange);
+
+            ChangeInfo changedForMoved = mPendingChanges.GetChangedForMoved(selectedChange);
+            ChangeInfo changedForMovedMeta = (changedForMoved == null) ?
+                null : mPendingChangesTreeView.GetMetaChange(changedForMoved);
+
+            DiffOperation.DiffWorkspaceContent(
+                mWkInfo,
+                selectedChangeMeta,
+                changedForMovedMeta,
+                mProgressControls,
+                null, null);
+        }
+
+        void PendingChangesViewMenu.IMetaMenuOperations.HistoryMeta()
+        {
+            ChangeInfo selectedChange = PendingChangesSelection
+                .GetSelectedChange(mPendingChangesTreeView);
+            ChangeInfo selectedChangeMeta = mPendingChangesTreeView.GetMetaChange(
+                selectedChange);
+
+            mHistoryViewLauncher.ShowHistoryView(
+                selectedChangeMeta.RepositorySpec,
+                selectedChangeMeta.RevInfo.ItemId,
+                selectedChangeMeta.Path,
+                selectedChangeMeta.IsDirectory);
+        }
+
+        void PendingChangesViewMenu.IMetaMenuOperations.OpenMeta()
+        {
+            List<string> selectedPaths = PendingChangesSelection
+                .GetSelectedMetaPaths(mPendingChangesTreeView);
+
+            FileSystemOperation.Open(selectedPaths);
+        }
+
+        void PendingChangesViewMenu.IMetaMenuOperations.OpenMetaWith()
+        {
+            List<string> selectedPaths = PendingChangesSelection
+                .GetSelectedMetaPaths(mPendingChangesTreeView);
+
+            OpenOperation.OpenWith(
+                FileSystemOperation.GetExePath(),
+                selectedPaths);
+        }
+
+        void PendingChangesViewMenu.IMetaMenuOperations.OpenMetaInExplorer()
+        {
+            List<string> selectedPaths = PendingChangesSelection
+                .GetSelectedMetaPaths(mPendingChangesTreeView);
+
+            if (selectedPaths.Count < 1)
+                return;
+
+            FileSystemOperation.OpenInExplorer(selectedPaths[0]);
+        }
+
+        SelectedChangesGroupInfo IPendingChangesMenuOperations.GetSelectedChangesGroupInfo()
+        {
+            return PendingChangesSelection.GetSelectedChangesGroupInfo(
+                mPendingChangesTreeView);
+        }
+
+        void IPendingChangesMenuOperations.Diff()
+        {
+            ChangeInfo selectedChange = PendingChangesSelection
+                .GetSelectedChange(mPendingChangesTreeView);
+
+            DiffOperation.DiffWorkspaceContent(
+                mWkInfo,
+                selectedChange,
+                mPendingChanges.GetChangedForMoved(selectedChange),
+                null,
+                null,
+                null);
+        }
+
+        void IPendingChangesMenuOperations.UndoChanges()
+        {
+            List<ChangeInfo> changesToUndo = PendingChangesSelection
+                .GetSelectedChanges(mPendingChangesTreeView);
+
+            List<ChangeInfo> dependenciesCandidates =
+                mPendingChangesTreeView.GetDependenciesCandidates(changesToUndo, true);
+
+            LaunchOperation.UndoChangesForMode(
+                mIsGluonMode, mPlasticClient, changesToUndo, dependenciesCandidates);
+        }
+
+        void IPendingChangesMenuOperations.SearchMatches()
+        {
+            ChangeInfo selectedChange = PendingChangesSelection
+                .GetSelectedChange(mPendingChangesTreeView);
+
+            if (selectedChange == null)
+                return;
+
+            SearchMatchesOperation operation = new SearchMatchesOperation(
+                mWkInfo, mPlasticClient, mPlasticClient,
+                mProgressControls, mDeveloperNewIncomingChangesUpdater);
+
+            operation.SearchMatches(
+                selectedChange,
+                PendingChangesSelection.GetAllChanges(mPendingChangesTreeView));
+        }
+
+        void IPendingChangesMenuOperations.ApplyLocalChanges()
+        {
+            List<ChangeInfo> selectedChanges = PendingChangesSelection
+                .GetSelectedChanges(mPendingChangesTreeView);
+
+            if (selectedChanges.Count == 0)
+                return;
+
+            ApplyLocalChangesOperation operation = new ApplyLocalChangesOperation(
+                mWkInfo, mPlasticClient, mPlasticClient,
+                mProgressControls, mDeveloperNewIncomingChangesUpdater);
+
+            operation.ApplyLocalChanges(
+                selectedChanges,
+                PendingChangesSelection.GetAllChanges(mPendingChangesTreeView));
+        }
+
+        void IPendingChangesMenuOperations.Delete()
+        {
+            List<string> privateDirectoriesToDelete;
+            List<string> privateFilesToDelete;
+
+            if (!mPendingChangesTreeView.GetSelectedPathsToDelete(
+                    out privateDirectoriesToDelete,
+                    out privateFilesToDelete))
+                return;
+
+            DeleteOperation.Delete(
+                mPlasticClient, mProgressControls,
+                privateDirectoriesToDelete, privateFilesToDelete,
+                mDeveloperNewIncomingChangesUpdater,
+                RefreshAsset.UnityAssetDatabase);
+        }
+
+        void IPendingChangesMenuOperations.Annotate()
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPendingChangesMenuOperations.History()
+        {
+            ChangeInfo selectedChange = PendingChangesSelection.
+                GetSelectedChange(mPendingChangesTreeView);
+
+            mHistoryViewLauncher.ShowHistoryView(
+                selectedChange.RepositorySpec,
+                selectedChange.RevInfo.ItemId,
+                selectedChange.Path,
+                selectedChange.IsDirectory);
+        }
+
+        void IOpenMenuOperations.Open()
+        {
+            List<string> selectedPaths = PendingChangesSelection.
+                GetSelectedPathsWithoutMeta(mPendingChangesTreeView);
+
+            FileSystemOperation.Open(selectedPaths);
+        }
+
+        void IOpenMenuOperations.OpenWith()
+        {
+            List<string> selectedPaths = PendingChangesSelection.
+                GetSelectedPathsWithoutMeta(mPendingChangesTreeView);
+
+            OpenOperation.OpenWith(
+                FileSystemOperation.GetExePath(),
+                selectedPaths);
+        }
+
+        void IOpenMenuOperations.OpenWithCustom(string exePath, string args)
+        {
+            List<string> selectedPaths = PendingChangesSelection.
+                GetSelectedPathsWithoutMeta(mPendingChangesTreeView);
+
+            OpenOperation.OpenWith(exePath, selectedPaths);
+        }
+
+        void IOpenMenuOperations.OpenInExplorer()
+        {
+            List<string> selectedPaths = PendingChangesSelection
+                .GetSelectedPathsWithoutMeta(mPendingChangesTreeView);
+
+            if (selectedPaths.Count < 1)
+                return;
+
+            FileSystemOperation.OpenInExplorer(selectedPaths[0]);
+        }
+
+        void IFilesFilterPatternsMenuOperations.AddFilesFilterPatterns(
+            FilterTypes type, FilterActions action, FilterOperationType operation)
+        {
+            List<string> selectedPaths = PendingChangesSelection.GetSelectedPaths(
+                mPendingChangesTreeView);
+
+            string[] rules = FilterRulesGenerator.GenerateRules(
+                selectedPaths, mWkInfo.ClientPath, action, operation);
+
+            bool isApplicableToAllWorkspaces = !mIsGluonMode;
+            bool isAddOperation = operation == FilterOperationType.Add;
+
+            FilterRulesConfirmationData filterRulesConfirmationData = 
+                FilterRulesConfirmationDialog.AskForConfirmation(
+                    rules, isAddOperation, isApplicableToAllWorkspaces, mParentWindow);
+
+            AddFilesFilterPatternsOperation.Run(
+                mWkInfo, mPlasticClient, type, operation, filterRulesConfirmationData);
+        }
+
+        void SearchField_OnDownOrUpArrowKeyPressed()
+        {
+            mPendingChangesTreeView.SetFocusAndEnsureSelectedItem();
+        }
+
+        void InitIgnoreRulesAndRefreshView(
+            string wkPath, IRefreshableView view)
+        {
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter(10);
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    if (IsIgnoreConfigDefined.For(wkPath))
+                        return;
+
+                    AddIgnoreRules.WriteRules(
+                        wkPath, UnityConditions.GetMissingIgnoredRules(wkPath));
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    mAreIgnoreRulesInitialized = true;
+
+                    view.Refresh();
+
+                    if (waiter.Exception == null)
+                        return;
+
+                    mLog.ErrorFormat(
+                        "Error adding ignore rules for Unity: {0}",
+                        waiter.Exception);
+
+                    mLog.DebugFormat(
+                        "Stack trace: {0}",
+                        waiter.Exception.StackTrace);
+                });
+        }
+
+        static void DoOperationsToolbar(
+            PlasticGUIClient plasticClient,
+            WorkspaceInfo wkInfo,
+            bool isGluonMode,
+            GenericMenu advancedDropdownMenu,
+            bool isOperationRunning)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            GUISpace.ForToolbar();
+
+            using (new GuiEnabled(!isOperationRunning))
+            {
+                using (new GuiEnabled(!plasticClient.IsCommentWarningNeeded))
+                {
+                    var checkinchanges = PlasticLocalization.GetString(PlasticLocalization.Name.CheckinChanges);
+                    if (DrawActionButton.For(checkinchanges))
+                    {
+                        LaunchOperation.CheckinForMode(
+                            wkInfo, isGluonMode, plasticClient.KeepItemsLocked,
+                            plasticClient);
+                    }
+                }
+
+                var undochanges = PlasticLocalization.GetString(PlasticLocalization.Name.UndoChanges);
+                if (DrawActionButton.For(undochanges))
+                {
+                    LaunchOperation.UndoForMode(isGluonMode, plasticClient);
+                }
+
+                if (isGluonMode)
+                {
+                    plasticClient.KeepItemsLocked = EditorGUILayout.ToggleLeft(
+                        PlasticLocalization.GetString(PlasticLocalization.Name.KeepLocked),
+                        plasticClient.KeepItemsLocked,
+                        GUILayout.Width(UnityConstants.EXTRA_LARGE_BUTTON_WIDTH));
+                }
+                //TODO: Codice - beta: hide the advanced menu until the behavior is implemented
+                /*else
+                {
+                    var dropDownContent = new GUIContent(string.Empty);
+                    var dropDownRect = GUILayoutUtility.GetRect(
+                        dropDownContent, EditorStyles.toolbarDropDown);
+
+                    if (EditorGUI.DropdownButton(dropDownRect, dropDownContent,
+                            FocusType.Passive, EditorStyles.toolbarDropDown))
+                        advancedDropdownMenu.DropDown(dropDownRect);
+                }*/
+            }
+
+            if (plasticClient.IsCommentWarningNeeded)
+            {
+                GUILayout.Space(5);
+                DoCheckinWarningMessage();
+            }
+
+            GUILayout.FlexibleSpace();
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoWarningMessage(string message)
+        {
+            GUILayout.Label(message, UnityStyles.WarningMessage);
+        }
+
+        static void DoCheckinWarningMessage()
+        {
+            string label = PlasticLocalization.GetString(PlasticLocalization.Name.PleaseComment);
+
+            GUILayout.Label(
+                new GUIContent(label, Images.GetWarnIcon()),
+                UnityStyles.PendingChangesTab.CommentWarningIcon);
+        }
+
+        void DoActionsToolbar(
+            WorkspaceInfo workspaceInfo,
+            bool isGluonMode,
+            IRefreshableView refreshableView,
+            ProgressControlsForViews progressControls,
+            EditorWindow editorWindow)
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            string checkinHeader = string.Format(
+                PlasticLocalization.GetString(PlasticLocalization.Name.CheckinHeader),
+                mPendingChangesTreeView.GetSelectedItemCount(),
+                mPendingChangesTreeView.GetTotalItemCount());
+
+            GUILayout.Label(checkinHeader, UnityStyles.PendingChangesTab.HeaderLabel);
+
+            if (progressControls.IsOperationRunning())
+            {
+                DrawProgressForViews.ForIndeterminateProgress(
+                    progressControls.ProgressData);
+            }
+
+            GUILayout.FlexibleSpace();
+
+            DrawSearchField.For(
+                mSearchField,
+                mPendingChangesTreeView,
+                UnityConstants.SEARCH_FIELD_WIDTH);
+
+            if (GUILayout.Button(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.Options),
+                    EditorStyles.toolbarButton,
+                    GUILayout.Width(UnityConstants.REGULAR_BUTTON_WIDTH)))
+            {
+                PendingChangesOptionsDialog.ChangeOptions(
+                    workspaceInfo, refreshableView, this, editorWindow);
+                GUIUtility.ExitGUI();
+            }
+
+            DoRefreshButton(
+                refreshableView,
+                progressControls.IsOperationRunning());
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        static void DoChangesArea(
+            PendingChangesTreeView changesTreeView,
+            bool isOperationRunning)
+        {
+            GUI.enabled = !isOperationRunning;
+
+            Rect rect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
+
+            changesTreeView.OnGUI(rect);
+
+            GUI.enabled = true;
+        }
+
+        static void DoMergeLinksArea(
+            MergeLinksListView mergeLinksListView, float width)
+        {
+            GUILayout.Label(
+                PlasticLocalization.GetString(
+                    PlasticLocalization.Name.MergeLinkDescriptionColumn),
+                EditorStyles.boldLabel);
+
+            float desiredTreeHeight = mergeLinksListView.DesiredHeight;
+
+            Rect treeRect = GUILayoutUtility.GetRect(
+                0, width, desiredTreeHeight, desiredTreeHeight);
+
+            mergeLinksListView.OnGUI(treeRect);
+        }
+
+        static void DoRefreshButton(
+            IRefreshableView refreshableView,
+            bool isOperationRunning)
+        {
+            EditorGUI.BeginDisabledGroup(isOperationRunning);
+
+            if (GUILayout.Button(new GUIContent(
+                    Images.GetRefreshIcon()), EditorStyles.toolbarButton))
+                refreshableView.Refresh();
+
+            EditorGUI.EndDisabledGroup();
+        }
+
+        void BuildComponents(
+            PlasticGUIClient plasticClient,
+            bool isGluonMode,
+            EditorWindow plasticWindow)
+        {
+            mHelpPanel = new HelpPanel(plasticWindow);
+
+            mAdvancedDropdownMenu = new GenericMenu();
+            mAdvancedDropdownMenu.AddItem(new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.UndoUnchangedButton)),
+                false, () => { });
+
+            mSearchField = new SearchField();
+            mSearchField.downOrUpArrowKeyPressed += SearchField_OnDownOrUpArrowKeyPressed;
+
+            PendingChangesTreeHeaderState headerState =
+                PendingChangesTreeHeaderState.GetDefault(isGluonMode);
+            TreeHeaderSettings.Load(headerState,
+                UnityConstants.PENDING_CHANGES_TABLE_SETTINGS_NAME,
+                (int)PendingChangesTreeColumn.Item, true);
+
+            mPendingChangesTreeView = new PendingChangesTreeView(
+                mWkInfo, mIsGluonMode, headerState,
+                PendingChangesTreeHeaderState.GetColumnNames(),
+                new PendingChangesViewMenu(this, this, this, this),
+                mAssetStatusCache);
+            mPendingChangesTreeView.Reload();
+
+            mMergeLinksListView = new MergeLinksListView();
+            mMergeLinksListView.Reload();
+        }
+
+        SearchField mSearchField;
+        INewChangesInWk mNewChangesInWk;
+        GenericMenu mAdvancedDropdownMenu;
+
+        PendingChangesTreeView mPendingChangesTreeView;
+        MergeLinksListView mMergeLinksListView;
+        HelpPanel mHelpPanel;
+
+        bool mIsAutoRefreshDisabled;
+
+        volatile bool mAreIgnoreRulesInitialized = false;
+
+        readonly ProgressControlsForViews mProgressControls;
+        readonly EditorWindow mParentWindow;
+        readonly IAssetStatusCache mAssetStatusCache;
+        readonly IHistoryViewLauncher mHistoryViewLauncher;
+        readonly PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges mPendingChanges;
+        readonly NewIncomingChangesUpdater mDeveloperNewIncomingChangesUpdater;
+        readonly bool mIsGluonMode;
+        readonly PlasticGUIClient mPlasticClient;
+        readonly WorkspaceInfo mWkInfo;
+
+        static readonly ILog mLog = LogManager.GetLogger("PendingChangesTab");
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTab.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTab.cs.meta
new file mode 100644
index 0000000..01534c6
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTab.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 1b2dfd8c552c2468ca523d8dbb93ea5d
+timeCreated: 1539019322
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeHeaderState.cs b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeHeaderState.cs
new file mode 100644
index 0000000..1183799
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeHeaderState.cs
@@ -0,0 +1,185 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using PlasticGui;
+using Unity.PlasticSCM.Editor.UI.Tree;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal enum PendingChangesTreeColumn
+    {
+        Item,
+        Status,
+        Size,
+        Extension,
+        Type,
+        DateModififed,
+        Repository
+    }
+
+    [Serializable]
+    internal class PendingChangesTreeHeaderState : MultiColumnHeaderState, ISerializationCallbackReceiver
+    {
+        internal static PendingChangesTreeHeaderState GetDefault(bool isGluonMode)
+        {
+            PendingChangesTreeHeaderState headerState =
+                new PendingChangesTreeHeaderState(BuildColumns());
+
+            headerState.visibleColumns = GetDefaultVisibleColumns();
+
+            SetMode(headerState, isGluonMode);
+
+            return headerState;
+        }
+
+        internal static List<string> GetColumnNames()
+        {
+            List<string> result = new List<string>();
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.ItemColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.StatusColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.SizeColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.ExtensionColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.TypeColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.DateModifiedColumn));
+            result.Add(PlasticLocalization.GetString(PlasticLocalization.Name.RepositoryColumn));
+            return result;
+        }
+
+        internal static string GetColumnName(PendingChangesTreeColumn column)
+        {
+            switch (column)
+            {
+                case PendingChangesTreeColumn.Item:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.ItemColumn);
+                case PendingChangesTreeColumn.Status:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.StatusColumn);
+                case PendingChangesTreeColumn.Size:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.SizeColumn);
+                case PendingChangesTreeColumn.Extension:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.ExtensionColumn);
+                case PendingChangesTreeColumn.Type:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.TypeColumn);
+                case PendingChangesTreeColumn.DateModififed:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.DateModifiedColumn);
+                case PendingChangesTreeColumn.Repository:
+                    return PlasticLocalization.GetString(PlasticLocalization.Name.RepositoryColumn);
+                default:
+                    return null;
+            }
+        }
+
+        internal static void SetMode(MultiColumnHeaderState state, bool isGluonMode)
+        {
+            List<int> result = state.visibleColumns.ToList();
+
+            if (!result.Contains((int)PendingChangesTreeColumn.Item))
+                result.Add((int)PendingChangesTreeColumn.Item);
+
+            if (isGluonMode)
+                result.Remove((int)PendingChangesTreeColumn.Type);
+
+            state.columns[(int)PendingChangesTreeColumn.Item].allowToggleVisibility = false;
+            state.columns[(int)PendingChangesTreeColumn.Type].allowToggleVisibility = !isGluonMode;
+
+            state.visibleColumns = result.ToArray();
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            if (mHeaderTitles != null)
+                TreeHeaderColumns.SetTitles(columns, mHeaderTitles);
+
+            if (mColumsAllowedToggleVisibility != null)
+                TreeHeaderColumns.SetVisibilities(columns, mColumsAllowedToggleVisibility);
+        }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+        }
+
+        static int[] GetDefaultVisibleColumns()
+        {
+            List<int> result = new List<int>();
+            result.Add((int)PendingChangesTreeColumn.Item);
+            result.Add((int)PendingChangesTreeColumn.Status);
+            result.Add((int)PendingChangesTreeColumn.DateModififed);
+            return result.ToArray();
+        }
+
+        static Column[] BuildColumns()
+        {
+            return new Column[]
+                {
+                    new Column()
+                    {
+                        width = 800,
+                        headerContent = new GUIContent(
+                            GetColumnName(PendingChangesTreeColumn.Item)),
+                        minWidth = 200
+                    },
+                    new Column()
+                    {
+                        width = 200,
+                        headerContent = new GUIContent(
+                            GetColumnName(PendingChangesTreeColumn.Status)),
+                        minWidth = 80
+                    },
+                    new Column()
+                    {
+                        width = 80,
+                        headerContent = new GUIContent(
+                            GetColumnName(PendingChangesTreeColumn.Size)),
+                        minWidth = 45
+                    },
+                    new Column()
+                    {
+                        width = 70,
+                        headerContent = new GUIContent(
+                            GetColumnName(PendingChangesTreeColumn.Extension)),
+                        minWidth = 50
+                    },
+                    new Column()
+                    {
+                        width = 60,
+                        headerContent = new GUIContent(
+                            GetColumnName(PendingChangesTreeColumn.Type)),
+                        minWidth = 45
+                    },
+                    new Column()
+                    {
+                        width = 330,
+                        headerContent = new GUIContent(
+                            GetColumnName(PendingChangesTreeColumn.DateModififed)),
+                        minWidth = 100
+                    },
+                    new Column()
+                    {
+                        width = 210,
+                        headerContent = new GUIContent(
+                            GetColumnName(PendingChangesTreeColumn.Repository)),
+                        minWidth = 90
+                    }
+                };
+        }
+
+        PendingChangesTreeHeaderState(Column[] columns)
+            : base(columns)
+        {
+            if (mHeaderTitles == null)
+                mHeaderTitles = TreeHeaderColumns.GetTitles(columns);
+
+            if (mColumsAllowedToggleVisibility == null)
+                mColumsAllowedToggleVisibility = TreeHeaderColumns.GetVisibilities(columns);
+        }
+
+        [SerializeField]
+        string[] mHeaderTitles;
+
+        [SerializeField]
+        bool[] mColumsAllowedToggleVisibility;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeHeaderState.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeHeaderState.cs.meta
new file mode 100644
index 0000000..107a645
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeHeaderState.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: e57affb3c41ab402e86f99747be972a2
+timeCreated: 1539690273
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeView.cs b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeView.cs
new file mode 100644
index 0000000..5297c6c
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeView.cs
@@ -0,0 +1,852 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Common;
+using Codice.CM.Common;
+
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.UI.Tree;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+using Unity.PlasticSCM.Editor.AssetsOverlays;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal class PendingChangesTreeView : TreeView
+    {
+        internal PendingChangesTreeView(
+            WorkspaceInfo wkInfo,
+            bool isGluonMode,
+            PendingChangesTreeHeaderState headerState,
+            List<string> columnNames,
+            PendingChangesViewMenu menu,
+            IAssetStatusCache assetStatusCache)
+            : base(new TreeViewState())
+        {
+            mWkInfo = wkInfo;
+            mIsGluonMode = isGluonMode;
+            mColumnNames = columnNames;
+            mMenu = menu;
+            mAssetStatusCache = assetStatusCache;
+
+            mPendingChangesTree = new UnityPendingChangesTree();
+
+            multiColumnHeader = new PendingChangesMultiColumnHeader(
+                headerState, mPendingChangesTree);
+            multiColumnHeader.canSort = true;
+            multiColumnHeader.sortingChanged += SortingChanged;
+
+            customFoldoutYOffset = UnityConstants.TREEVIEW_FOLDOUT_Y_OFFSET;
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+
+            mCooldownFilterAction = new CooldownWindowDelayer(
+                DelayedSearchChanged, UnityConstants.SEARCH_DELAYED_INPUT_ACTION_INTERVAL);
+        }
+
+        protected override void SelectionChanged(IList<int> selectedIds)
+        {
+            if (mIsSelectionChangedEventDisabled)
+                return;
+
+            List<UnityEngine.Object> assets = new List<UnityEngine.Object>();
+
+            foreach (ChangeInfo changeInfo in GetSelectedChanges(false))
+            {
+                UnityEngine.Object asset = LoadAsset.FromChangeInfo(changeInfo);
+
+                if (asset == null)
+                    continue;
+
+                assets.Add(asset);
+            }
+
+            UnityEditor.Selection.objects = assets.ToArray();
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        public override void OnGUI(Rect rect)
+        {
+            base.OnGUI(rect);
+
+            Event e = Event.current;
+
+            if (e.type != EventType.KeyDown)
+                return;
+
+            bool isProcessed = mMenu.ProcessKeyActionIfNeeded(e);
+
+            if (isProcessed)
+                e.Use();
+        }
+
+        protected override bool CanChangeExpandedState(TreeViewItem item)
+        {
+            return item is ChangeCategoryTreeViewItem;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem rootItem)
+        {
+            try
+            {
+                RegenerateRows(
+                    mPendingChangesTree, mTreeViewItemIds, this,
+                    rootItem, mRows, mExpandCategories);
+            }
+            finally
+            {
+                mExpandCategories = false;
+            }
+
+            return mRows;
+        }
+
+        protected override void CommandEventHandling()
+        {
+            // NOTE - empty override to prevent crash when pressing ctrl-a in the treeview
+        }
+
+        protected override void SearchChanged(string newSearch)
+        {
+            mCooldownFilterAction.Ping();
+        }
+
+        protected override void ContextClickedItem(int id)
+        {
+            mMenu.Popup();
+            Repaint();
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            DrawTreeViewItem.InitializeStyles();
+
+            if (args.item is ChangeCategoryTreeViewItem)
+            {
+                CategoryTreeViewItemGUI(
+                    args.rowRect, rowHeight,
+                    (ChangeCategoryTreeViewItem)args.item,
+                    args.selected, args.focused);
+                return;
+            }
+
+            if (args.item is ChangeTreeViewItem)
+            {
+                ChangeTreeViewItemGUI(
+                    mWkInfo.ClientPath,
+                    mIsGluonMode,
+                    mAssetStatusCache,
+                    this,
+                    mPendingChangesTree,
+                    (ChangeTreeViewItem)args.item,
+                    args);
+                return;
+            }
+
+            base.RowGUI(args);
+        }
+
+        internal void BuildModel(
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges,
+            CheckedStateManager checkedStateManager)
+        {
+            mTreeViewItemIds.Clear();
+
+            mPendingChangesTree.BuildChangeCategories(
+                mWkInfo.ClientPath, pendingChanges, checkedStateManager);
+        }
+
+        internal void Refilter()
+        {
+            Filter filter = new Filter(searchString);
+            mPendingChangesTree.Filter(filter, mColumnNames);
+
+            mExpandCategories = true;
+        }
+
+        internal void Sort()
+        {
+            int sortedColumnIdx = multiColumnHeader.state.sortedColumnIndex;
+            bool sortAscending = multiColumnHeader.IsSortedAscending(sortedColumnIdx);
+
+            mPendingChangesTree.Sort(
+                mColumnNames[sortedColumnIdx],
+                sortAscending);
+        }
+
+        internal SelectedChangesGroupInfo GetSelectedChangesGroupInfo()
+        {
+            SelectedChangesGroupInfo result = new SelectedChangesGroupInfo();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<PendingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                ChangeInfo changeInfo = item.Key.ChangeInfo;
+
+                result.SelectedCount++;
+                result.IsAnyDirectorySelected |= changeInfo.IsDirectory;
+                result.IsAnyPrivateSelected |= !ChangeInfoType.IsControlled(changeInfo);
+                result.IsAnyControlledSelected |= ChangeInfoType.IsControlled(changeInfo);
+                result.IsAnyLocalChangeSelected |= ChangeInfoType.IsLocalChange(changeInfo);
+
+                result.FilterInfo.IsAnyIgnoredSelected |= ChangeInfoType.IsIgnored(changeInfo);
+                result.FilterInfo.IsAnyHiddenChangedSelected |= ChangeInfoType.IsHiddenChanged(changeInfo);
+
+                string wkRelativePath = InternalNames.RootDir +
+                    WorkspacePath.GetWorkspaceRelativePath(
+                        mWkInfo.ClientPath, changeInfo.GetFullPath());
+
+                if (result.SelectedCount == 1)
+                {
+                    result.FilterInfo.CommonName = Path.GetFileName(changeInfo.GetFullPath());
+                    result.FilterInfo.CommonExtension = changeInfo.GetExtension();
+                    result.FilterInfo.CommonFullPath = wkRelativePath;
+                    continue;
+                }
+
+                if (result.FilterInfo.CommonName != Path.GetFileName(changeInfo.GetFullPath()))
+                    result.FilterInfo.CommonName = null;
+
+                if (result.FilterInfo.CommonExtension != changeInfo.GetExtension())
+                    result.FilterInfo.CommonExtension = null;
+
+                if (result.FilterInfo.CommonFullPath != wkRelativePath)
+                    result.FilterInfo.CommonFullPath = null;
+            }
+
+            return result;
+        }
+
+        internal bool GetSelectedPathsToDelete(
+            out List<string> privateDirectories,
+            out List<string> privateFiles)
+        {
+            privateDirectories = new List<string>();
+            privateFiles = new List<string>();
+
+            List<ChangeInfo> dirChanges = new List<ChangeInfo>();
+            List<ChangeInfo> fileChanges = new List<ChangeInfo>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return false;
+
+            foreach (KeyValuePair<PendingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                ChangeInfo changeInfo = item.Key.ChangeInfo;
+
+                if (ChangeInfoType.IsControlled(changeInfo))
+                    continue;
+
+                if (changeInfo.IsDirectory)
+                {
+                    dirChanges.Add(changeInfo);
+                    continue;
+                }
+
+                fileChanges.Add(changeInfo);
+            }
+
+            mPendingChangesTree.FillWithMeta(fileChanges);
+            mPendingChangesTree.FillWithMeta(dirChanges);
+
+            privateDirectories = dirChanges.Select(
+                d => d.GetFullPath()).ToList();
+            privateFiles = fileChanges.Select(
+                f => f.GetFullPath()).ToList();
+
+            return true;
+        }
+
+        internal void GetCheckedChanges(
+            bool bExcludePrivates,
+            out List<ChangeInfo> changes,
+            out List<ChangeInfo> dependenciesCandidates)
+        {
+            mPendingChangesTree.GetCheckedChanges(
+                bExcludePrivates, out changes, out dependenciesCandidates);
+        }
+
+        internal List<ChangeInfo> GetAllChanges()
+        {
+            List<ChangeInfo> result = new List<ChangeInfo>();
+            foreach (PendingChangeCategory category in mPendingChangesTree.GetNodes())
+            {
+                foreach (PendingChangeInfo change in category.GetCurrentChanges())
+                    result.Add(change.ChangeInfo);
+            }
+
+            mPendingChangesTree.FillWithMeta(result);
+
+            return result;
+        }
+
+        internal ChangeInfo GetMetaChange(ChangeInfo change)
+        {
+            if (change == null)
+                return null;
+
+            return mPendingChangesTree.GetMetaChange(change);
+        }
+
+        internal List<ChangeInfo> GetDependenciesCandidates(
+            List<ChangeInfo> selectedChanges, bool bExcludePrivates)
+        {
+            return mPendingChangesTree.GetDependenciesCandidates(
+                selectedChanges, bExcludePrivates);
+        }
+
+        internal List<ChangeInfo> GetSelectedChanges(bool includeMetaFiles)
+        {
+            List<ChangeInfo> result = new List<ChangeInfo>();
+
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return result;
+
+            foreach (KeyValuePair<PendingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (!selectedIds.Contains(item.Value))
+                    continue;
+
+                result.Add(item.Key.ChangeInfo);
+            }
+
+            if (includeMetaFiles)
+                mPendingChangesTree.FillWithMeta(result);
+
+            return result;
+        }
+
+        internal bool SelectionHasMeta()
+        {
+            ChangeInfo selectedChangeInfo = GetSelectedRow();
+
+            if (selectedChangeInfo == null)
+                return false;
+
+            return mPendingChangesTree.HasMeta(selectedChangeInfo);
+        }
+
+        internal ChangeInfo GetSelectedRow()
+        {
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return null;
+
+            int selectedId = selectedIds[0];
+
+            foreach (KeyValuePair<PendingChangeInfo, int> item
+                in mTreeViewItemIds.GetInfoItems())
+            {
+                if (selectedId == item.Value)
+                    return item.Key.ChangeInfo;
+            }
+
+            return null;
+        }
+
+        internal ChangeInfo GetNearestAddedChange()
+        {
+            IList<int> selectedIds = GetSelection();
+
+            if (selectedIds.Count == 0)
+                return null;
+
+            int id = selectedIds[0];
+
+            IList<TreeViewItem> treeViewItems =
+                FindRows(new List<int>() { id });
+
+            if (treeViewItems.Count == 0)
+                return null;
+
+            PendingChangeInfo changeInfo =
+                ((ChangeTreeViewItem)treeViewItems[0]).ChangeInfo;
+            PendingChangeCategory category =
+                (PendingChangeCategory)changeInfo.GetParent();
+
+            int itemIndex = category.GetChildPosition(changeInfo);
+
+            ChangeInfo result = GetNextExistingAddedItem(category, itemIndex);
+
+            if (result != null)
+                return result;
+
+            return GetPreviousExistingAddedItem(category, itemIndex);
+        }
+
+        internal void SelectFirstPendingChangeOnTree()
+        {
+            int treeIdFirstItem = GetTreeIdFirstItem();
+
+            if (treeIdFirstItem == -1)
+                return;
+
+            mIsSelectionChangedEventDisabled = true;
+
+            try
+            {
+                TableViewOperations.SetSelectionAndScroll(
+                    this, new List<int> { treeIdFirstItem });
+            }
+            finally
+            {
+                mIsSelectionChangedEventDisabled = false;
+            }
+        }
+
+        internal void SelectPreviouslySelectedPendingChanges(
+            List<ChangeInfo> changesToSelect)
+        {
+            List<int> idsToSelect = new List<int>();
+
+            foreach (ChangeInfo change in changesToSelect)
+            {
+                int changeId = GetTreeIdForItem(change);
+
+                if (changeId == -1)
+                    continue;
+
+                idsToSelect.Add(changeId);
+            }
+
+            mIsSelectionChangedEventDisabled = true;
+            try
+            {
+                TableViewOperations.SetSelectionAndScroll(
+                    this, idsToSelect);
+            }
+            finally
+            {
+                mIsSelectionChangedEventDisabled = false;
+            }
+        }
+
+        internal int GetSelectedItemCount()
+        {
+            List<PendingChangeCategory> categories = mPendingChangesTree.GetNodes();
+
+            if (categories == null)
+                return 0;
+
+            int checkedCount = 0;
+            foreach (PendingChangeCategory category in categories)
+            {
+                checkedCount += category.GetCheckedChangesCount();
+            }
+            return checkedCount;
+        }
+
+        internal int GetTotalItemCount()
+        {
+            List<PendingChangeCategory> categories = mPendingChangesTree.GetNodes();
+
+            if (categories == null)
+                return 0;
+
+            int totalCount = 0;
+            foreach (PendingChangeCategory category in categories)
+            {
+                totalCount += category.GetChildrenCount();
+            }
+            return totalCount;
+        }
+
+        ChangeInfo GetNextExistingAddedItem(
+            PendingChangeCategory addedCategory, int targetAddedItemIndex)
+        {
+            int addedItemsCount = addedCategory.GetChildrenCount();
+
+            for (int i = targetAddedItemIndex + 1; i < addedItemsCount; i++)
+            {
+                ChangeInfo currentChangeInfo = GetExistingAddedItem(addedCategory, i);
+
+                if (currentChangeInfo != null)
+                    return currentChangeInfo;
+            }
+
+            return null;
+        }
+
+        ChangeInfo GetPreviousExistingAddedItem(
+            PendingChangeCategory addedCategory, int targetAddedItemIndex)
+        {
+            for (int i = targetAddedItemIndex - 1; i >= 0; i--)
+            {
+                ChangeInfo currentChangeInfo = GetExistingAddedItem(addedCategory, i);
+
+                if (currentChangeInfo != null)
+                    return currentChangeInfo;
+            }
+
+            return null;
+        }
+
+        ChangeInfo GetExistingAddedItem(
+            PendingChangeCategory addedCategory, int addedItemIndex)
+        {
+            ChangeInfo currentChangeInfo = ((PendingChangeInfo)addedCategory.
+                GetChild(addedItemIndex)).ChangeInfo;
+
+            if (Directory.Exists(currentChangeInfo.Path) ||
+                File.Exists(currentChangeInfo.Path))
+                return currentChangeInfo;
+
+            return null;
+        }
+
+        int GetTreeIdFirstItem()
+        {
+            List<PendingChangeCategory> categories = mPendingChangesTree.GetNodes();
+
+            if (categories == null)
+                return -1;
+
+            if (categories.Count == 0)
+                return -1;
+
+            List<PendingChangeInfo> changes = categories[0].GetCurrentChanges();
+
+            if (changes.Count == 0)
+                return -1;
+
+            int changeId;
+            if (mTreeViewItemIds.TryGetInfoItemId(changes[0], out changeId))
+                return changeId;
+
+            return -1;
+        }
+
+        int GetTreeIdForItem(ChangeInfo change)
+        {
+            foreach (KeyValuePair<PendingChangeInfo, int> item in mTreeViewItemIds.GetInfoItems())
+            {
+                ChangeInfo changeInfo = item.Key.ChangeInfo;
+
+                if (changeInfo.ChangeTypes != change.ChangeTypes)
+                    continue;
+
+                if (changeInfo.GetFullPath() != change.GetFullPath())
+                    continue;
+
+                return item.Value;
+            }
+
+            return -1;
+        }
+
+        void DelayedSearchChanged()
+        {
+            Refilter();
+
+            Sort();
+
+            Reload();
+
+            TableViewOperations.ScrollToSelection(this);
+        }
+
+        void SortingChanged(MultiColumnHeader multiColumnHeader)
+        {
+            Sort();
+
+            Reload();
+        }
+
+        static void CategoryTreeViewItemGUI(
+            Rect rowRect,
+            float rowHeight,
+            ChangeCategoryTreeViewItem item,
+            bool isSelected,
+            bool isFocused)
+        {
+            Texture icon = GetCategoryIcon(item.Category);
+            string label = item.Category.GetHeaderText();
+
+            bool wasChecked = item.Category.IsChecked();
+            bool hadCheckedChildren = item.Category.GetCheckedChangesCount() > 0;
+
+            bool isChecked = DrawTreeViewItem.ForCheckableCategoryItem(
+                rowRect, rowHeight, item.depth, icon, label,
+                isSelected, isFocused, wasChecked, hadCheckedChildren);
+
+            if (!wasChecked && isChecked)
+            {
+                item.Category.UpdateCheckedState(true);
+                return;
+            }
+
+            if (wasChecked && !isChecked)
+            {
+                item.Category.UpdateCheckedState(false);
+                return;
+            }
+        }
+
+        static void ChangeTreeViewItemGUI(
+            string wkPath,
+            bool isGluonMode,
+            IAssetStatusCache assetStatusCache,
+            PendingChangesTreeView treeView,
+            UnityPendingChangesTree pendingChangesTree,
+            ChangeTreeViewItem item,
+            RowGUIArgs args)
+        {
+            for (int visibleColumnIdx = 0; visibleColumnIdx < args.GetNumVisibleColumns(); visibleColumnIdx++)
+            {
+                Rect cellRect = args.GetCellRect(visibleColumnIdx);
+
+                PendingChangesTreeColumn column =
+                    (PendingChangesTreeColumn)args.GetColumn(visibleColumnIdx);
+
+                ChangeTreeViewItemCellGUI(
+                    isGluonMode,
+                    assetStatusCache,
+                    cellRect,
+                    treeView.rowHeight,
+                    treeView,
+                    pendingChangesTree,
+                    item,
+                    column,
+                    args.selected,
+                    args.focused);
+            }
+        }
+
+        static void ChangeTreeViewItemCellGUI(
+            bool isGluonMode,
+            IAssetStatusCache assetStatusCache,
+            Rect rect,
+            float rowHeight,
+            PendingChangesTreeView treeView,
+            UnityPendingChangesTree pendingChangesTree,
+            ChangeTreeViewItem item,
+            PendingChangesTreeColumn column,
+            bool isSelected,
+            bool isFocused)
+        {
+            PendingChangeInfo changeInfo = item.ChangeInfo;
+
+            string label = changeInfo.GetColumnText(
+                PendingChangesTreeHeaderState.GetColumnName(column));
+
+            if (column == PendingChangesTreeColumn.Item)
+            {
+                if (pendingChangesTree.HasMeta(changeInfo.ChangeInfo))
+                    label = string.Concat(label, UnityConstants.TREEVIEW_META_LABEL);
+
+                Texture icon = GetIcon(changeInfo);
+
+                bool isConflicted = IsConflicted(
+                    isGluonMode, assetStatusCache,
+                    changeInfo.ChangeInfo.GetFullPath());
+
+                GetChangesOverlayIcon.Data overlayIconData =
+                    GetChangesOverlayIcon.ForPendingChange(
+                        changeInfo.ChangeInfo, isConflicted);
+
+                bool wasChecked = changeInfo.IsChecked();
+
+                bool isChecked = DrawTreeViewItem.ForCheckableItemCell(
+                    rect, rowHeight, item.depth,
+                    icon, overlayIconData, label,
+                    isSelected, isFocused, false,
+                    wasChecked);
+
+                changeInfo.UpdateCheckedState(isChecked);
+
+                if (wasChecked != isChecked)
+                    UpdateCheckStateForSelection(treeView, item);
+
+                return;
+            }
+
+            if (column == PendingChangesTreeColumn.Size)
+            {
+                DrawTreeViewItem.ForSecondaryLabelRightAligned(
+                    rect, label, isSelected, isFocused, false);
+                return;
+            }
+
+            DrawTreeViewItem.ForSecondaryLabel(
+                rect, label, isSelected, isFocused, false);
+        }
+
+        static void UpdateCheckStateForSelection(
+            PendingChangesTreeView treeView,
+            ChangeTreeViewItem senderTreeViewItem)
+        {
+            IList<int> selectedIds = treeView.GetSelection();
+
+            if (selectedIds.Count <= 1)
+                return;
+
+            if (!selectedIds.Contains(senderTreeViewItem.id))
+                return;
+
+            bool isChecked = senderTreeViewItem.ChangeInfo.IsChecked();
+
+            foreach (TreeViewItem treeViewItem in treeView.FindRows(selectedIds))
+            {
+                if (treeViewItem is ChangeCategoryTreeViewItem)
+                {
+                    ((ChangeCategoryTreeViewItem)treeViewItem).Category
+                        .UpdateCheckedState(isChecked);
+                    continue;
+                }
+
+                ((ChangeTreeViewItem)treeViewItem).ChangeInfo
+                    .UpdateCheckedState(isChecked);
+            }
+        }
+
+        static void RegenerateRows(
+            UnityPendingChangesTree pendingChangesTree,
+            TreeViewItemIds<PendingChangeCategory, PendingChangeInfo> treeViewItemIds,
+            PendingChangesTreeView treeView,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows,
+            bool expandCategories)
+        {
+            ClearRows(rootItem, rows);
+
+            List<PendingChangeCategory> categories = pendingChangesTree.GetNodes();
+
+            if (categories == null)
+                return;
+
+            foreach (PendingChangeCategory category in categories)
+            {
+                int categoryId;
+                if (!treeViewItemIds.TryGetCategoryItemId(category, out categoryId))
+                    categoryId = treeViewItemIds.AddCategoryItem(category);
+
+                ChangeCategoryTreeViewItem categoryTreeViewItem =
+                    new ChangeCategoryTreeViewItem(categoryId, category);
+
+                rootItem.AddChild(categoryTreeViewItem);
+                rows.Add(categoryTreeViewItem);
+
+                if (!expandCategories &&
+                    !treeView.IsExpanded(categoryTreeViewItem.id))
+                    continue;
+
+                foreach (PendingChangeInfo change in category.GetCurrentChanges())
+                {
+                    int changeId;
+                    if (!treeViewItemIds.TryGetInfoItemId(change, out changeId))
+                        changeId = treeViewItemIds.AddInfoItem(change);
+
+                    TreeViewItem changeTreeViewItem =
+                        new ChangeTreeViewItem(changeId, change);
+
+                    categoryTreeViewItem.AddChild(changeTreeViewItem);
+                    rows.Add(changeTreeViewItem);
+                }
+            }
+
+            if (!expandCategories)
+                return;
+
+            treeView.state.expandedIDs = treeViewItemIds.GetCategoryIds();
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static Texture GetCategoryIcon(PendingChangeCategory category)
+        {
+            switch (category.Type)
+            {
+                case PendingChangeCategoryType.Added:
+                    return Images.GetImage(Images.Name.IconAdded);
+                case PendingChangeCategoryType.Changed:
+                    return Images.GetImage(Images.Name.IconChanged);
+                case PendingChangeCategoryType.Deleted:
+                    return Images.GetImage(Images.Name.IconDeleted);
+                case PendingChangeCategoryType.Moved:
+                    return Images.GetImage(Images.Name.IconMoved);
+                default:
+                    return null;
+            }
+        }
+
+        static Texture GetIcon(PendingChangeInfo change)
+        {
+            if (change.ChangeInfo.IsDirectory)
+                return Images.GetDirectoryIcon();
+
+            string fullPath = change.ChangeInfo.GetFullPath();
+            return Images.GetFileIcon(fullPath);
+        }
+
+        static bool IsConflicted(
+            bool isGluonMode,
+            IAssetStatusCache assetStatusCache,
+            string fullPath)
+        {
+            if (!isGluonMode)
+                return false;
+
+            return ClassifyAssetStatus.IsConflicted(
+                assetStatusCache.GetStatusForPath(fullPath));
+        }
+
+        bool mExpandCategories;
+        bool mIsSelectionChangedEventDisabled;
+
+        TreeViewItemIds<PendingChangeCategory, PendingChangeInfo> mTreeViewItemIds =
+            new TreeViewItemIds<PendingChangeCategory, PendingChangeInfo>();
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        UnityPendingChangesTree mPendingChangesTree;
+        CooldownWindowDelayer mCooldownFilterAction;
+
+        readonly PendingChangesViewMenu mMenu;
+        readonly IAssetStatusCache mAssetStatusCache;
+        readonly List<string> mColumnNames;
+        readonly bool mIsGluonMode;
+        readonly WorkspaceInfo mWkInfo;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeView.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeView.cs.meta
new file mode 100644
index 0000000..143f59f
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesTreeView.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 594dcd9e9e4804aa281a66d024d30752
+timeCreated: 1539617947
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesViewMenu.cs b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesViewMenu.cs
new file mode 100644
index 0000000..bc2b06a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesViewMenu.cs
@@ -0,0 +1,432 @@
+using UnityEditor;
+using UnityEngine;
+
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.Items;
+using PlasticGui.WorkspaceWindow.Open;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal class PendingChangesViewMenu
+    {
+        internal interface IMetaMenuOperations
+        {
+            void DiffMeta();
+            void OpenMeta();
+            void OpenMetaWith();
+            void OpenMetaInExplorer();
+            void HistoryMeta();
+            bool SelectionHasMeta();
+        }
+
+        internal PendingChangesViewMenu(
+            IPendingChangesMenuOperations pendingChangesMenuOperations,
+            IOpenMenuOperations openMenuOperations,
+            IMetaMenuOperations metaMenuOperations,
+            IFilesFilterPatternsMenuOperations filterMenuOperations)
+        {
+            mPendingChangesMenuOperations = pendingChangesMenuOperations;
+            mOpenMenuOperations = openMenuOperations;
+            mMetaMenuOperations = metaMenuOperations;
+
+            mFilterMenuBuilder = new FilesFilterPatternsMenuBuilder(filterMenuOperations);
+
+            BuildComponents();
+        }
+
+        internal void Popup()
+        {
+            GenericMenu menu = new GenericMenu();
+
+            UpdateMenuItems(menu);
+
+            menu.ShowAsContext();
+        }
+
+        internal bool ProcessKeyActionIfNeeded(Event e)
+        {
+            PendingChangesMenuOperations operationToExecute =
+                GetPendingChangesMenuOperation(e);
+
+            OpenMenuOperations openOperationToExecute =
+                GetOpenMenuOperation(e);
+
+            if (operationToExecute == PendingChangesMenuOperations.None &&
+                openOperationToExecute == OpenMenuOperations.None)
+                return false;
+
+            SelectedChangesGroupInfo info =
+                mPendingChangesMenuOperations.GetSelectedChangesGroupInfo();
+
+            if (operationToExecute != PendingChangesMenuOperations.None)
+                return ProcessKeyActionForPendingChangesMenu(
+                    operationToExecute, mPendingChangesMenuOperations, info);
+
+            return ProcessKeyActionForOpenMenu(
+                openOperationToExecute, mOpenMenuOperations, info);
+        }
+
+        void OpenMenuItem_Click()
+        {
+            mOpenMenuOperations.Open();
+        }
+
+        void OpenWithMenuItem_Click()
+        {
+            mOpenMenuOperations.OpenWith();
+        }
+
+        void OpenInExplorerMenuItem_Click()
+        {
+            mOpenMenuOperations.OpenInExplorer();
+        }
+
+        void OpenMetaMenuItem_Click()
+        {
+            mMetaMenuOperations.OpenMeta();
+        }
+
+        void OpenMetaWithMenuItem_Click()
+        {
+            mMetaMenuOperations.OpenMetaWith();
+        }
+
+        void OpenMetaInExplorerMenuItem_Click()
+        {
+            mMetaMenuOperations.OpenMetaInExplorer();
+        }
+
+        void DiffMenuItem_Click()
+        {
+            mPendingChangesMenuOperations.Diff();
+        }
+
+        void DiffMetaMenuItem_Click()
+        {
+            mMetaMenuOperations.DiffMeta();
+        }
+
+        void UndoChangesMenuItem_Click()
+        {
+            mPendingChangesMenuOperations.UndoChanges();
+        }
+
+        void CheckoutMenuItem_Click()
+        {
+            mPendingChangesMenuOperations.ApplyLocalChanges();
+        }
+
+        void DeleteMenuItem_Click()
+        {
+            mPendingChangesMenuOperations.Delete();
+        }
+
+        void HistoryMenuItem_Click()
+        {
+            mPendingChangesMenuOperations.History();
+        }
+
+        void HistoryMetaMenuItem_Click()
+        {
+            mMetaMenuOperations.HistoryMeta();
+        }
+
+        void UpdateMenuItems(GenericMenu menu)
+        {
+            SelectedChangesGroupInfo info =
+                mPendingChangesMenuOperations.GetSelectedChangesGroupInfo();
+
+            PendingChangesMenuOperations operations =
+                PendingChangesMenuUpdater.GetAvailableMenuOperations(info);
+
+            OpenMenuOperations openOperations =
+                GetOpenMenuOperations.ForPendingChanges(info);
+
+            if (operations == PendingChangesMenuOperations.None &&
+                openOperations == OpenMenuOperations.None)
+            {
+                menu.AddDisabledItem(GetNoActionMenuItemContent());
+                return;
+            }
+
+            UpdateOpenMenuItems(menu, openOperations);
+
+            menu.AddSeparator(string.Empty);
+
+            if (operations.HasFlag(PendingChangesMenuOperations.DiffWorkspaceContent))
+                menu.AddItem(mDiffMenuItemContent, false, DiffMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDiffMenuItemContent);
+
+            if (mMetaMenuOperations.SelectionHasMeta())
+            {
+                if (operations.HasFlag(PendingChangesMenuOperations.DiffWorkspaceContent))
+                    menu.AddItem(mDiffMetaMenuItemContent, false, DiffMetaMenuItem_Click);
+                else
+                    menu.AddDisabledItem(mDiffMetaMenuItemContent);
+            }
+
+            menu.AddSeparator(string.Empty);
+
+            if (operations.HasFlag(PendingChangesMenuOperations.UndoChanges))
+                menu.AddItem(mUndoChangesMenuItemContent, false, UndoChangesMenuItem_Click);
+            else
+                menu.AddDisabledItem(mUndoChangesMenuItemContent);
+
+            menu.AddSeparator(string.Empty);
+
+            if (operations.HasFlag(PendingChangesMenuOperations.ApplyLocalChanges))
+                menu.AddItem(mCheckoutMenuItemContent, false, CheckoutMenuItem_Click);
+            else
+                menu.AddDisabledItem(mCheckoutMenuItemContent);
+
+            if (operations.HasFlag(PendingChangesMenuOperations.Delete))
+                menu.AddItem(mDeleteMenuItemContent, false, DeleteMenuItem_Click);
+            else
+                menu.AddDisabledItem(mDeleteMenuItemContent);
+
+            menu.AddSeparator(string.Empty);
+
+            mFilterMenuBuilder.UpdateMenuItems(
+                menu, FilterMenuUpdater.GetMenuActions(info));
+
+            menu.AddSeparator(string.Empty);
+
+            if (operations.HasFlag(PendingChangesMenuOperations.History))
+                menu.AddItem(mViewHistoryMenuItemContent, false, HistoryMenuItem_Click);
+            else
+                menu.AddDisabledItem(mViewHistoryMenuItemContent, false);
+
+            if (mMetaMenuOperations.SelectionHasMeta())
+            {
+                if (operations.HasFlag(PendingChangesMenuOperations.History))
+                    menu.AddItem(mViewHistoryMetaMenuItemContent, false, HistoryMetaMenuItem_Click);
+                else
+                    menu.AddDisabledItem(mViewHistoryMetaMenuItemContent);
+            }
+        }
+
+        void UpdateOpenMenuItems(GenericMenu menu, OpenMenuOperations operations)
+        {
+            if (!operations.HasFlag(OpenMenuOperations.Open) &&
+                !operations.HasFlag(OpenMenuOperations.OpenWith) &&
+                !operations.HasFlag(OpenMenuOperations.OpenInExplorer))
+            {
+                menu.AddDisabledItem(mOpenSubmenuItemContent);
+                return;
+            }
+
+            if (operations.HasFlag(OpenMenuOperations.Open))
+                menu.AddItem(mOpenMenuItemContent, false, OpenMenuItem_Click);
+            else
+                menu.AddDisabledItem(mOpenMenuItemContent);
+
+            if (operations.HasFlag(OpenMenuOperations.OpenWith))
+                menu.AddItem(mOpenWithMenuItemContent, false, OpenWithMenuItem_Click);
+            else
+                menu.AddDisabledItem(mOpenWithMenuItemContent);
+
+            if (operations.HasFlag(OpenMenuOperations.OpenInExplorer))
+                menu.AddItem(mOpenInExplorerMenuItemContent, false, OpenInExplorerMenuItem_Click);
+            else
+                menu.AddDisabledItem(mOpenInExplorerMenuItemContent);
+
+            if (!mMetaMenuOperations.SelectionHasMeta())
+                return;
+
+            menu.AddSeparator(PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpen) + "/");
+
+            if (operations.HasFlag(OpenMenuOperations.Open))
+                menu.AddItem(mOpenMetaMenuItemContent, false, OpenMetaMenuItem_Click);
+            else
+                menu.AddDisabledItem(mOpenMetaMenuItemContent);
+
+            if (operations.HasFlag(OpenMenuOperations.OpenWith))
+                menu.AddItem(mOpenMetaWithMenuItemContent, false, OpenMetaWithMenuItem_Click);
+            else
+                menu.AddDisabledItem(mOpenMetaWithMenuItemContent);
+
+            if (operations.HasFlag(OpenMenuOperations.OpenInExplorer))
+                menu.AddItem(mOpenMetaInExplorerMenuItemContent, false, OpenMetaInExplorerMenuItem_Click);
+            else
+                menu.AddDisabledItem(mOpenMetaInExplorerMenuItemContent);
+        }
+
+        GUIContent GetNoActionMenuItemContent()
+        {
+            if (mNoActionMenuItemContent == null)
+            {
+                mNoActionMenuItemContent = new GUIContent(PlasticLocalization.GetString(
+                    PlasticLocalization.Name.NoActionMenuItem));
+            }
+
+            return mNoActionMenuItemContent;
+        }
+
+        void BuildComponents()
+        {
+            mOpenSubmenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpen));
+            mOpenMenuItemContent = new GUIContent(
+                UnityMenuItem.GetText(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpen),
+                    string.Format("{0} {1}",
+                        PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpen),
+                        GetPlasticShortcut.ForOpen())));
+            mOpenWithMenuItemContent = new GUIContent(
+                UnityMenuItem.GetText(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpen),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpenWith)));
+            mOpenInExplorerMenuItemContent = new GUIContent(
+                UnityMenuItem.GetText(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpen),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.OpenInExplorerMenuItem)));
+            mOpenMetaMenuItemContent = new GUIContent(
+                UnityMenuItem.GetText(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpen),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.OpenMeta)));
+            mOpenMetaWithMenuItemContent = new GUIContent(
+                UnityMenuItem.GetText(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpen),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.OpenMetaWith)));
+            mOpenMetaInExplorerMenuItemContent = new GUIContent(
+                UnityMenuItem.GetText(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.ItemsMenuItemOpen),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.OpenMetaInExplorer)));
+            mDiffMenuItemContent = new GUIContent(string.Format("{0} {1}",
+                PlasticLocalization.GetString(PlasticLocalization.Name.DiffMenuItem),
+                GetPlasticShortcut.ForDiff()));
+            mDiffMetaMenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.DiffMetaMenuItem));
+            mUndoChangesMenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.PendingChangesMenuItemUndoChanges));
+            mCheckoutMenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.PendingChangesMenuItemCheckout));
+            mDeleteMenuItemContent = new GUIContent(string.Format("{0} {1}",
+                PlasticLocalization.GetString(PlasticLocalization.Name.PendingChangesMenuItemDelete),
+                GetPlasticShortcut.ForDelete()));
+            mViewHistoryMenuItemContent = new GUIContent(string.Format("{0} {1}",
+                PlasticLocalization.GetString(PlasticLocalization.Name.ViewHistoryMenuItem),
+                GetPlasticShortcut.ForHistory()));
+            mViewHistoryMetaMenuItemContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.ViewHistoryMetaMenuItem));
+
+            mFilterMenuBuilder.BuildIgnoredSubmenuItem();
+            mFilterMenuBuilder.BuildHiddenChangesSubmenuItem();
+        }
+
+        static bool ProcessKeyActionForPendingChangesMenu(
+            PendingChangesMenuOperations operationToExecute,
+            IPendingChangesMenuOperations pendingChangesMenuOperations,
+            SelectedChangesGroupInfo info)
+        {
+            PendingChangesMenuOperations operations =
+                    PendingChangesMenuUpdater.GetAvailableMenuOperations(info);
+
+            if (!operations.HasFlag(operationToExecute))
+                return false;
+
+            ProcessPendingChangesMenuOperation(
+                operationToExecute, pendingChangesMenuOperations);
+
+            return true;
+        }
+
+        static bool ProcessKeyActionForOpenMenu(
+            OpenMenuOperations openOperationToExecute,
+            IOpenMenuOperations openMenuOperations,
+            SelectedChangesGroupInfo info)
+        {
+            OpenMenuOperations openOperations =
+                GetOpenMenuOperations.ForPendingChanges(info);
+
+            if (!openOperations.HasFlag(openOperationToExecute))
+                return false;
+
+            ProcessOpenMenuOperation(
+                openOperationToExecute, openMenuOperations);
+
+            return true;
+        }
+
+        static void ProcessPendingChangesMenuOperation(
+            PendingChangesMenuOperations operationToExecute,
+            IPendingChangesMenuOperations pendingChangesMenuOperations)
+        {
+            if (operationToExecute == PendingChangesMenuOperations.DiffWorkspaceContent)
+            {
+                pendingChangesMenuOperations.Diff();
+                return;
+            }
+
+            if (operationToExecute == PendingChangesMenuOperations.Delete)
+            {
+                pendingChangesMenuOperations.Delete();
+                return;
+            }
+
+            if (operationToExecute == PendingChangesMenuOperations.History)
+            {
+                pendingChangesMenuOperations.History();
+                return;
+            }
+        }
+
+        static void ProcessOpenMenuOperation(
+            OpenMenuOperations openOperationToExecute,
+            IOpenMenuOperations openMenuOperations)
+        {
+            if (openOperationToExecute == OpenMenuOperations.Open)
+            {
+                openMenuOperations.Open();
+                return;
+            }
+        }
+
+        static PendingChangesMenuOperations GetPendingChangesMenuOperation(Event e)
+        {
+            if (Keyboard.IsControlOrCommandKeyPressed(e) && Keyboard.IsKeyPressed(e, KeyCode.D))
+                return PendingChangesMenuOperations.DiffWorkspaceContent;
+
+            if (Keyboard.IsKeyPressed(e, KeyCode.Delete))
+                return PendingChangesMenuOperations.Delete;
+
+            if (Keyboard.IsControlOrCommandKeyPressed(e) && Keyboard.IsKeyPressed(e, KeyCode.H))
+                return PendingChangesMenuOperations.History;
+
+            return PendingChangesMenuOperations.None;
+        }
+
+        static OpenMenuOperations GetOpenMenuOperation(Event e)
+        {
+            if (Keyboard.IsShiftPressed(e) && Keyboard.IsKeyPressed(e, KeyCode.O))
+                return OpenMenuOperations.Open;
+
+            return OpenMenuOperations.None;
+        }
+
+        GUIContent mNoActionMenuItemContent;
+
+        GUIContent mOpenSubmenuItemContent;
+        GUIContent mOpenMenuItemContent;
+        GUIContent mOpenWithMenuItemContent;
+        GUIContent mOpenInExplorerMenuItemContent;
+        GUIContent mOpenMetaMenuItemContent;
+        GUIContent mOpenMetaWithMenuItemContent;
+        GUIContent mOpenMetaInExplorerMenuItemContent;
+        GUIContent mDiffMenuItemContent;
+        GUIContent mDiffMetaMenuItemContent;
+        GUIContent mUndoChangesMenuItemContent;
+        GUIContent mCheckoutMenuItemContent;
+        GUIContent mDeleteMenuItemContent;
+        GUIContent mViewHistoryMenuItemContent;
+        GUIContent mViewHistoryMetaMenuItemContent;
+
+        FilesFilterPatternsMenuBuilder mFilterMenuBuilder;
+        IMetaMenuOperations mMetaMenuOperations;
+        IOpenMenuOperations mOpenMenuOperations;
+        IPendingChangesMenuOperations mPendingChangesMenuOperations;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingChangesViewMenu.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesViewMenu.cs.meta
new file mode 100644
index 0000000..a2a63c6
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingChangesViewMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0092dcc3ac595ea43981eedc23012f72
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks.meta b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks.meta
new file mode 100644
index 0000000..b356905
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e91cd01ab44d05b4fabcebe1e4ce2ebe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinkListViewItem.cs b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinkListViewItem.cs
new file mode 100644
index 0000000..5f1a2a9
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinkListViewItem.cs
@@ -0,0 +1,22 @@
+using UnityEditor.IMGUI.Controls;
+
+using PlasticGui.WorkspaceWindow.PendingChanges;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges.PendingMergeLinks
+{
+    internal class MergeLinkListViewItem : TreeViewItem
+    {
+        internal MountPendingMergeLink MergeLink { get; private set; }
+
+        internal MergeLinkListViewItem(int id, MountPendingMergeLink mergeLink)
+            : base(id, 0)
+        {
+            MergeLink = mergeLink;
+
+            displayName = mergeLink.GetPendingMergeLinkText();
+            icon = Images.GetImage(Images.Name.IconMergeLink);
+        }
+    }
+}
+
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinkListViewItem.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinkListViewItem.cs.meta
new file mode 100644
index 0000000..6287148
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinkListViewItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fb7decaf4f8be254dafddd860f82f560
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinksListView.cs b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinksListView.cs
new file mode 100644
index 0000000..5d8d2b3
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinksListView.cs
@@ -0,0 +1,116 @@
+using System.Collections.Generic;
+
+using UnityEditor.IMGUI.Controls;
+
+using Codice.Client.Commands;
+using Codice.Client.Common;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges.PendingMergeLinks
+{
+    internal class MergeLinksListView : TreeView
+    {
+        internal float DesiredHeight
+        {
+            get
+            {
+                return rowHeight * (mMergeLinks.Count + 1);
+            }
+        }
+
+        internal MergeLinksListView()
+            : base(new TreeViewState())
+        {
+            rowHeight = UnityConstants.TREEVIEW_ROW_HEIGHT;
+            showAlternatingRowBackgrounds = true;
+        }
+
+        public override IList<TreeViewItem> GetRows()
+        {
+            return mRows;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            return new TreeViewItem(0, -1, string.Empty);
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem rootItem)
+        {
+            RegenerateRows(mMergeLinks, rootItem, mRows);
+            return mRows;
+        }
+
+        internal void BuildModel(
+            IDictionary<MountPoint, IList<PendingMergeLink>> pendingMergeLinks)
+        {
+            mMergeLinks = BuildMountPendingMergeLink(pendingMergeLinks);
+        }
+
+        static void RegenerateRows(
+            List<MountPendingMergeLink> mergeLinks,
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            ClearRows(rootItem, rows);
+
+            if (mergeLinks.Count == 0)
+                return;
+
+            for (int i = 0; i < mergeLinks.Count; i++)
+            {
+                MergeLinkListViewItem mergeLinkListViewItem =
+                    new MergeLinkListViewItem(i + 1, mergeLinks[i]);
+
+                rootItem.AddChild(mergeLinkListViewItem);
+                rows.Add(mergeLinkListViewItem);
+            }
+        }
+
+        static void ClearRows(
+            TreeViewItem rootItem,
+            List<TreeViewItem> rows)
+        {
+            if (rootItem.hasChildren)
+                rootItem.children.Clear();
+
+            rows.Clear();
+        }
+
+        static List<MountPendingMergeLink> BuildMountPendingMergeLink(
+            IDictionary<MountPoint, IList<PendingMergeLink>> pendingMergeLinks)
+        {
+            List<MountPendingMergeLink> result = new List<MountPendingMergeLink>();
+
+            foreach (KeyValuePair<MountPoint, IList<PendingMergeLink>> mountLink
+                in pendingMergeLinks)
+            {
+                result.AddRange(BuildMountPendingMergeLinks(
+                    mountLink.Key, mountLink.Value));
+            }
+
+            return result;
+        }
+
+        static List<MountPendingMergeLink> BuildMountPendingMergeLinks(
+            MountPoint mount, IList<PendingMergeLink> links)
+        {
+            List<MountPendingMergeLink> result = new List<MountPendingMergeLink>();
+
+            RepositoryInfo repInfo = RepositorySpecResolverProvider.Get().
+                GetRepInfo(mount.RepSpec);
+
+            foreach (PendingMergeLink link in links)
+                result.Add(new MountPendingMergeLink(repInfo.GetRepSpec(), link));
+
+            return result;
+        }
+
+        List<TreeViewItem> mRows = new List<TreeViewItem>();
+
+        List<MountPendingMergeLink> mMergeLinks = new List<MountPendingMergeLink>();
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinksListView.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinksListView.cs.meta
new file mode 100644
index 0000000..211955d
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/PendingMergeLinks/MergeLinksListView.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 3ee6978573f6f410a9b799889ea0ad13
+timeCreated: 1541785757
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTree.cs b/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTree.cs
new file mode 100644
index 0000000..0d8c5fd
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTree.cs
@@ -0,0 +1,205 @@
+using System.Collections.Generic;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using PlasticGui;
+using PlasticGui.WorkspaceWindow.PendingChanges;
+
+namespace Unity.PlasticSCM.Editor.Views.PendingChanges
+{
+    internal class UnityPendingChangesTree
+    {
+        internal UnityPendingChangesTree()
+        {
+            mInnerTree = new PendingChangesTree();
+            mMetaCache = new MetaCache();
+        }
+
+        internal List<PendingChangeCategory> GetNodes()
+        {
+            return mInnerTree.GetNodes();
+        }
+
+        internal bool HasMeta(ChangeInfo changeInfo)
+        {
+            return mMetaCache.ContainsMeta(changeInfo);
+        }
+
+        internal ChangeInfo GetMetaChange(ChangeInfo change)
+        {
+            return mMetaCache.GetExistingMeta(change);
+        }
+
+        internal void FillWithMeta(List<ChangeInfo> changes)
+        {
+            changes.AddRange(
+                mMetaCache.GetExistingMeta(changes));
+        }
+
+        internal void GetCheckedChanges(
+            bool bExcludePrivates,
+            out List<ChangeInfo> changes,
+            out List<ChangeInfo> dependenciesCandidates)
+        {
+            mInnerTree.GetCheckedChanges(
+                bExcludePrivates,
+                out changes,
+                out dependenciesCandidates);
+
+            changes.AddRange(
+                mMetaCache.GetExistingMeta(changes));
+            dependenciesCandidates.AddRange(
+                mMetaCache.GetExistingMeta(dependenciesCandidates));
+        }
+
+        internal List<ChangeInfo> GetDependenciesCandidates(
+            List<ChangeInfo> selectedChanges,
+            bool bExcludePrivates)
+        {
+            return mInnerTree.GetDependenciesCandidates(
+                selectedChanges, bExcludePrivates);
+        }
+
+        internal void BuildChangeCategories(
+            string wkPath,
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges,
+            CheckedStateManager checkedStateManager)
+        {
+            mMetaCache.Build(pendingChanges);
+
+            mInnerTree.BuildChangeCategories(
+                wkPath,
+                pendingChanges,
+                checkedStateManager);
+        }
+
+        internal void Filter(Filter filter, List<string> columnNames)
+        {
+            mInnerTree.Filter(filter, columnNames);
+        }
+
+        internal void Sort(string key, bool ascending)
+        {
+            mInnerTree.Sort(key, ascending);
+        }
+
+        MetaCache mMetaCache;
+        PendingChangesTree mInnerTree;
+
+        class MetaCache
+        {
+            internal bool ContainsMeta(ChangeInfo changeInfo)
+            {
+                string key = BuildKey.ForMetaChange(changeInfo);
+
+                return mCache.ContainsKey(key);
+            }
+
+            internal ChangeInfo GetExistingMeta(ChangeInfo change)
+            {
+                ChangeInfo result;
+
+                if (!mCache.TryGetValue(BuildKey.ForMetaChange(change), out result))
+                    return null;
+
+                return result;
+            }
+
+            internal List<ChangeInfo> GetExistingMeta(
+                List<ChangeInfo> changes)
+            {
+                List<ChangeInfo> result = new List<ChangeInfo>();
+
+                foreach (ChangeInfo change in changes)
+                {
+                    string key = BuildKey.ForMetaChange(change);
+
+                    ChangeInfo metaChange;
+                    if (!mCache.TryGetValue(key, out metaChange))
+                        continue;
+
+                    result.Add(metaChange);
+                }
+
+                return result;
+            }
+
+            internal void Build(PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges)
+            {
+                mCache.Clear();
+
+                ExtractMetaToCache(pendingChanges.Added, mCache);
+                ExtractMetaToCache(pendingChanges.Deleted, mCache);
+                ExtractMetaToCache(pendingChanges.Changed, mCache);
+                ExtractMetaToCache(pendingChanges.Moved, mCache);
+            }
+
+            static void ExtractMetaToCache(
+                List<ChangeInfo> changes,
+                Dictionary<string, ChangeInfo> cache)
+            {
+                HashSet<string> indexedKeys = BuildIndexedKeys(changes);
+
+                for (int i = changes.Count - 1; i >= 0; i--)
+                {
+                    ChangeInfo currentChange = changes[i];
+
+                    if (!MetaPath.IsMetaPath(currentChange.Path))
+                        continue;
+
+                    string realPath = MetaPath.GetPathFromMetaPath(currentChange.Path);
+
+                    if (!indexedKeys.Contains(BuildKey.BuildCacheKey(
+                        currentChange.ChangeTypes, realPath)))
+                        continue;
+
+                    // found foo.c and foo.c.meta
+                    // with the same chage types - move .meta to cache
+                    cache.Add(BuildKey.ForChange(currentChange), currentChange);
+                    changes.RemoveAt(i);
+                }
+            }
+
+            static HashSet<string> BuildIndexedKeys(
+                List<ChangeInfo> changes)
+            {
+                HashSet<string> result = new HashSet<string>();
+
+                foreach (ChangeInfo change in changes)
+                {
+                    if (MetaPath.IsMetaPath(change.Path))
+                        continue;
+
+                    result.Add(BuildKey.ForChange(change));
+                }
+
+                return result;
+            }
+
+            Dictionary<string, ChangeInfo> mCache =
+                new Dictionary<string, ChangeInfo>();
+
+            static class BuildKey
+            {
+                internal static string ForChange(ChangeInfo change)
+                {
+                    return BuildCacheKey(
+                        change.ChangeTypes,
+                        change.Path);
+                }
+
+                internal static string ForMetaChange(ChangeInfo change)
+                {
+                    return BuildCacheKey(
+                        change.ChangeTypes,
+                        MetaPath.GetMetaPath(change.Path));
+                }
+
+                internal static string BuildCacheKey(ChangeTypes changeTypes, string path)
+                {
+                    return string.Concat(changeTypes, ":", path);
+                }
+            }
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTree.cs.meta b/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTree.cs.meta
new file mode 100644
index 0000000..391eafe
--- /dev/null
+++ b/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTree.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e4e6f1fad14d65f4b9e72a5675054db9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Welcome.meta b/Editor/PlasticSCM/Views/Welcome.meta
new file mode 100644
index 0000000..115fb63
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4419c9c829ee0e9438a5c3ceba3ca88b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Welcome/ConfigurePlasticOperation.cs b/Editor/PlasticSCM/Views/Welcome/ConfigurePlasticOperation.cs
new file mode 100644
index 0000000..c8a06ef
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/ConfigurePlasticOperation.cs
@@ -0,0 +1,44 @@
+using System.Diagnostics;
+using Codice.Client.BaseCommands;
+using Codice.Client.Common;
+using Codice.Client.Common.Threading;
+using PlasticGui;
+using Unity.PlasticSCM.Editor.Tool;
+using Unity.PlasticSCM.Editor.UI.Progress;
+
+namespace Unity.PlasticSCM.Editor.Views.Welcome
+{
+    static class ConfigurePlasticOperation
+    {
+        internal static void Run(
+            bool isGluonMode,
+            ProgressControlsForViews progressControls)
+        {
+            ((IProgressControls)progressControls).ShowProgress(string.Empty);
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter();
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    Process plasticProcess = LaunchTool.OpenConfigurationForMode(isGluonMode);
+
+                    if (plasticProcess != null)
+                        plasticProcess.WaitForExit();
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    ((IProgressControls)progressControls).HideProgress();
+
+                    ClientConfig.Reset();
+                    CmConnection.Reset();
+                    ClientHandlers.Register();
+
+                    if (waiter.Exception == null)
+                        return;
+
+                    ((IProgressControls)progressControls).ShowError(
+                        waiter.Exception.Message);
+                });
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Welcome/ConfigurePlasticOperation.cs.meta b/Editor/PlasticSCM/Views/Welcome/ConfigurePlasticOperation.cs.meta
new file mode 100644
index 0000000..d4f5dcf
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/ConfigurePlasticOperation.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 262b35af4ccf6854d834d5982a8fd23f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Welcome/DownloadAndInstallOperation.cs b/Editor/PlasticSCM/Views/Welcome/DownloadAndInstallOperation.cs
new file mode 100644
index 0000000..f10bcd8
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/DownloadAndInstallOperation.cs
@@ -0,0 +1,229 @@
+using System.Diagnostics;
+using System.IO;
+using System.Net;
+
+using Codice.Client.Common.Threading;
+using Codice.Client.Common.WebApi;
+using Codice.CM.Common;
+using Codice.Utils;
+using PlasticGui;
+using PlasticGui.Help.NewVersions;
+using PlasticGui.WorkspaceWindow;
+using Unity.PlasticSCM.Editor.Tool;
+using Unity.PlasticSCM.Editor.UI.Progress;
+using Unity.PlasticSCM.Editor.WebApi;
+
+namespace Unity.PlasticSCM.Editor.Views.Welcome
+{
+    class DownloadAndInstallOperation
+    {
+        internal static void Run(
+            Edition plasticEdition,
+            string installerDestinationPath,
+            ProgressControlsForViews progressControls)
+        {
+            ((IProgressControls)progressControls).ShowProgress(
+                PlasticLocalization.GetString(PlasticLocalization.Name.DownloadingProgress));
+
+            NewVersionResponse plasticVersion = null;
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter();
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    plasticVersion =
+                        PlasticScmRestApiClient.GetLastVersion(plasticEdition);
+
+                    if (plasticVersion == null)
+                        return;
+
+                    string installerUrl = GetInstallerUrl(
+                        plasticVersion.Version,
+                        plasticEdition == Edition.Cloud);
+
+                    DownloadInstaller(
+                        installerUrl,
+                        installerDestinationPath,
+                        progressControls);
+
+                    if (!PlatformIdentifier.IsMac())
+                        return;
+
+                    installerDestinationPath = UnZipMacOsPackage(
+                        installerDestinationPath);
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    ((IProgressControls)progressControls).HideProgress();
+
+                    if (waiter.Exception != null)
+                    {
+                        ((IProgressControls)progressControls).ShowError(
+                            waiter.Exception.Message);
+                        return;
+                    }
+
+                    if (plasticVersion == null)
+                    {
+                        ((IProgressControls)progressControls).ShowError(
+                            PlasticLocalization.GetString(PlasticLocalization.Name.ConnectingError));
+                        return;
+                    }
+
+                    if (!File.Exists(installerDestinationPath))
+                        return;
+
+                    RunInstaller(
+                        installerDestinationPath,
+                        progressControls);
+                });
+        }
+
+        static void RunInstaller(
+            string installerPath,
+            ProgressControlsForViews progressControls)
+        {
+            progressControls.ProgressData.ProgressPercent = -1;
+
+            ((IProgressControls)progressControls).ShowProgress(
+                PlasticLocalization.GetString(PlasticLocalization.Name.InstallingProgress));
+
+            MacOSConfigWorkaround configWorkaround = new MacOSConfigWorkaround();
+
+            IThreadWaiter waiter = ThreadWaiter.GetWaiter();
+            waiter.Execute(
+                /*threadOperationDelegate*/ delegate
+                {
+                    configWorkaround.CreateClientConfigIfNeeded();
+
+                    Process installerProcess =
+                        LaunchInstaller.ForPlatform(installerPath);
+
+                    if (installerProcess != null)
+                        installerProcess.WaitForExit();
+
+                    configWorkaround.DeleteClientConfigIfNeeded();
+                },
+                /*afterOperationDelegate*/ delegate
+                {
+                    ((IProgressControls)progressControls).HideProgress();
+
+                    if (waiter.Exception != null)
+                    {
+                        ((IProgressControls)progressControls).ShowError(
+                            waiter.Exception.Message);
+                        return;
+                    }
+
+                    File.Delete(installerPath);
+                });
+        }
+
+        static void DownloadInstaller(
+            string url,
+            string destinationPath,
+            ProgressControlsForViews progressControls)
+        {
+            int bytesProcessed = 0;
+
+            Stream remoteStream = null;
+            Stream localStream = null;
+            WebResponse response = null;
+
+            try
+            {
+                WebRequest request = WebRequest.Create(url);
+                response = request.GetResponse();
+
+                long totalBytes = response.ContentLength;
+
+                if (File.Exists(destinationPath) &&
+                    new FileInfo(destinationPath).Length == totalBytes)
+                {
+                    UnityEngine.Debug.LogFormat(
+                        PlasticLocalization.GetString(PlasticLocalization.Name.SkippingDownloadFileExists),
+                        destinationPath);
+                    return;
+                }
+
+                remoteStream = response.GetResponseStream();
+
+                localStream = File.Create(destinationPath);
+
+                byte[] buffer = new byte[100 * 1024];
+                int bytesRead;
+
+                do
+                {
+                    bytesRead = remoteStream.Read(buffer, 0, buffer.Length);
+                    localStream.Write(buffer, 0, bytesRead);
+                    bytesProcessed += bytesRead;
+
+                    progressControls.ProgressData.ProgressPercent = GetProgressBarPercent.
+                        ForTransfer(bytesProcessed, totalBytes) / 100f;
+
+                } while (bytesRead > 0);
+            }
+            finally
+            {
+                if (response != null)
+                    response.Close();
+
+                if (remoteStream != null)
+                    remoteStream.Close();
+
+                if (localStream != null)
+                    localStream.Close();
+            }
+        }
+
+        static string UnZipMacOsPackage(
+            string zipInstallerPath)
+        {
+            try
+            {
+                string pkgInstallerPath = zipInstallerPath.Substring(
+                    0, zipInstallerPath.Length - ".zip".Length);
+
+                string unzipCommand = string.Format(
+                    "unzip -p \"{0}\" > \"{1}\"",
+                    zipInstallerPath, pkgInstallerPath);
+
+                unzipCommand = unzipCommand.Replace("\"", "\"\"");
+
+                ProcessStartInfo processStartInfo = new ProcessStartInfo();
+                processStartInfo.FileName = "/bin/bash";
+                processStartInfo.Arguments = string.Format("-c \"{0}\"", unzipCommand);
+                processStartInfo.UseShellExecute = false;
+                processStartInfo.RedirectStandardOutput = true;
+                processStartInfo.CreateNoWindow = true;
+
+                Process process = Process.Start(processStartInfo);
+                process.WaitForExit();
+
+                return pkgInstallerPath;
+            }
+            finally
+            {
+                File.Delete(zipInstallerPath);
+            }
+        }
+
+        static string GetInstallerUrl(
+            string version,
+            bool isCloudEdition)
+        {
+            string edition = isCloudEdition ?
+                "cloudedition" : "full";
+
+            string platform = PlatformIdentifier.IsMac() ?
+                "macosx" : "windows";
+
+            return string.Format(
+                @"https://www.plasticscm.com/download/downloadinstaller/{0}/plasticscm/{1}/{2}",
+                version,
+                platform,
+                edition);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Welcome/DownloadAndInstallOperation.cs.meta b/Editor/PlasticSCM/Views/Welcome/DownloadAndInstallOperation.cs.meta
new file mode 100644
index 0000000..1c4175d
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/DownloadAndInstallOperation.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f00521067f54ce541951ab90047cc3f4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Welcome/GetInstallerTmpFileName.cs b/Editor/PlasticSCM/Views/Welcome/GetInstallerTmpFileName.cs
new file mode 100644
index 0000000..3fa83ac
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/GetInstallerTmpFileName.cs
@@ -0,0 +1,25 @@
+using System;
+using System.IO;
+
+using Codice.Utils;
+
+namespace Unity.PlasticSCM.Editor.Views.Welcome
+{
+    static class GetInstallerTmpFileName
+    {
+        internal static string ForPlatform()
+        {
+            string fileName = Guid.NewGuid().ToString();
+
+            if (PlatformIdentifier.IsWindows())
+                fileName += ".exe";
+
+            if (PlatformIdentifier.IsMac())
+                fileName += ".pkg.zip";
+
+            return Path.Combine(
+                Path.GetTempPath(),
+                fileName);
+        }
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Welcome/GetInstallerTmpFileName.cs.meta b/Editor/PlasticSCM/Views/Welcome/GetInstallerTmpFileName.cs.meta
new file mode 100644
index 0000000..5809c4c
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/GetInstallerTmpFileName.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3e8b32f158e489044a2b257700530f05
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Welcome/MacOSConfigWorkaround.cs b/Editor/PlasticSCM/Views/Welcome/MacOSConfigWorkaround.cs
new file mode 100644
index 0000000..d39f48a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/MacOSConfigWorkaround.cs
@@ -0,0 +1,49 @@
+using System.IO;
+using Codice.Client.Common;
+using Codice.Utils;
+
+namespace Unity.PlasticSCM.Editor.Views.Welcome
+{
+    class MacOSConfigWorkaround
+    {
+        /* In macOS there is no way to pass a parameter
+         * to the PKG installer to avoid launching
+         * Plastic at the end of the installation process.
+
+         * As a workaround, we can create an empty client.conf in
+         * the user config folder. This way the installer skips
+         * launching Plastic at the end of the installation process.
+
+         * see /01plastic/install/mac/macplastic/Scripts/postinstall
+
+         * Then, we delete the client.conf file if we created it */
+
+        internal void CreateClientConfigIfNeeded()
+        {
+            if (!PlatformIdentifier.IsMac())
+                return;
+
+            string clientConfFile = ConfigFileLocation.GetConfigFilePath(
+                ClientConfig.CLIENT_CONFIG_FILE_NAME);
+
+            if (File.Exists(clientConfFile))
+                return;
+
+            File.Create(clientConfFile).Close();
+            mClientConfigCreated = true;
+        }
+
+        internal void DeleteClientConfigIfNeeded()
+        {
+            if (!mClientConfigCreated)
+                return;
+
+            string clientConfFile = ConfigFileLocation.GetConfigFilePath(
+                ClientConfig.CLIENT_CONFIG_FILE_NAME);
+
+            File.Delete(clientConfFile);
+        }
+
+        bool mClientConfigCreated;
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Welcome/MacOSConfigWorkaround.cs.meta b/Editor/PlasticSCM/Views/Welcome/MacOSConfigWorkaround.cs.meta
new file mode 100644
index 0000000..8f0b2ee
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/MacOSConfigWorkaround.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bc1e10ffb13c5b548948d8c725368507
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/Views/Welcome/WelcomeView.cs b/Editor/PlasticSCM/Views/Welcome/WelcomeView.cs
new file mode 100644
index 0000000..367043e
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/WelcomeView.cs
@@ -0,0 +1,459 @@
+using UnityEditor;
+using UnityEngine;
+
+using Codice.Client.Common;
+using Codice.CM.Common;
+using PlasticGui;
+using PlasticGui.WebApi;
+using Unity.PlasticSCM.Editor.AssetUtils;
+using Unity.PlasticSCM.Editor.UI;
+using Unity.PlasticSCM.Editor.Views.CreateWorkspace;
+using Unity.PlasticSCM.Editor.UI.Progress;
+
+namespace Unity.PlasticSCM.Editor.Views.Welcome
+{
+    internal class WelcomeView
+    {
+        internal WelcomeView(
+            EditorWindow parentWindow,
+            CreateWorkspaceView.ICreateWorkspaceListener createWorkspaceListener,
+            PlasticAPI plasticApi,
+            IPlasticWebRestApi plasticWebRestApi)
+        {
+            mParentWindow = parentWindow;
+            mCreateWorkspaceListener = createWorkspaceListener;
+            mPlasticApi = plasticApi;
+            mPlasticWebRestApi = plasticWebRestApi;
+
+            mGuiMessage = new UnityPlasticGuiMessage(parentWindow);
+            mDownloadProgress = new ProgressControlsForViews();
+            mConfigureProgress = new ProgressControlsForViews();
+
+            mInstallerFile = GetInstallerTmpFileName.ForPlatform();
+        }
+
+
+        internal void Update()
+        {
+            if (mCreateWorkspaceView != null)
+                mCreateWorkspaceView.Update();
+
+            mDownloadProgress.UpdateDeterminateProgress(mParentWindow);
+            mConfigureProgress.UpdateDeterminateProgress(mParentWindow);
+        }
+
+        internal void OnGUI(
+            bool isPlasticExeAvailable,
+            bool clientNeedsConfiguration,
+            bool isGluonMode)
+        {
+            GUILayout.BeginHorizontal();
+
+            GUILayout.Space(LEFT_MARGIN);
+
+            DoContentViewArea(
+                isPlasticExeAvailable,
+                clientNeedsConfiguration,
+                isGluonMode,
+                mIsCreateWorkspaceButtonClicked,
+                mInstallerFile,
+                mGuiMessage,
+                mDownloadProgress,
+                mConfigureProgress);
+
+            GUILayout.EndHorizontal();
+        }
+
+        void DoContentViewArea(
+            bool isPlasticExeAvailable,
+            bool clientNeedsConfiguration,
+            bool isGluonMode,
+            bool isCreateWorkspaceButtonClicked,
+            string installerFile,
+            GuiMessage.IGuiMessage guiMessage,
+            ProgressControlsForViews downloadProgress,
+            ProgressControlsForViews configureProgress)
+        {
+            GUILayout.BeginVertical();
+
+            GUILayout.Space(TOP_MARGIN);
+
+            if (isCreateWorkspaceButtonClicked)
+                GetCreateWorkspaceView().OnGUI();
+            else
+                DoSetupViewArea(
+                    isPlasticExeAvailable,
+                    clientNeedsConfiguration,
+                    isGluonMode,
+                    mInstallerFile,
+                    mGuiMessage,
+                    mDownloadProgress,
+                    mConfigureProgress);
+
+            GUILayout.EndVertical();
+        }
+
+        void DoSetupViewArea(
+            bool isPlasticExeAvailable,
+            bool clientNeedsConfiguration,
+            bool isGluonMode,
+            string installerFile,
+            GuiMessage.IGuiMessage guiMessage,
+            ProgressControlsForViews downloadProgress,
+            ProgressControlsForViews configureProgress)
+        {
+            DoTitleLabel();
+
+            GUILayout.Space(STEPS_TOP_MARGIN);
+
+            bool isStep1Completed =
+                isPlasticExeAvailable &
+                !downloadProgress.ProgressData.IsOperationRunning;
+
+            bool isStep2Completed =
+                isStep1Completed &
+                !clientNeedsConfiguration &
+                !configureProgress.ProgressData.IsOperationRunning;
+
+            DoStepsArea(
+                isStep1Completed,
+                isStep2Completed,
+                downloadProgress.ProgressData,
+                configureProgress.ProgressData);
+
+            GUILayout.Space(BUTTON_MARGIN);
+
+            DoActionButtonsArea(
+                isStep1Completed,
+                isStep2Completed,
+                isGluonMode,
+                installerFile,
+                guiMessage,
+                downloadProgress,
+                configureProgress);
+
+            DoNotificationArea(
+                downloadProgress.ProgressData,
+                configureProgress.ProgressData);
+        }
+
+        void DoActionButtonsArea(
+            bool isStep1Completed,
+            bool isStep2Completed,
+            bool isGluonMode,
+            string installerFile,
+            GuiMessage.IGuiMessage guiMessage,
+            ProgressControlsForViews downloadProgress,
+            ProgressControlsForViews configureProgress)
+        {
+            GUILayout.BeginHorizontal();
+
+            DoActionButton(
+                isStep1Completed,
+                isStep2Completed,
+                isGluonMode,
+                installerFile,
+                guiMessage,
+                downloadProgress,
+                configureProgress);
+
+            GUILayout.FlexibleSpace();
+
+            GUILayout.EndHorizontal();
+        }
+
+        void DoActionButton(
+            bool isStep1Completed,
+            bool isStep2Completed,
+            bool isGluonMode,
+            string installerFile,
+            GuiMessage.IGuiMessage guiMessage,
+            ProgressControlsForViews downloadProgress,
+            ProgressControlsForViews configureProgress)
+        {
+            if (!isStep1Completed)
+            {
+                DoInstallButton(
+                    downloadProgress, guiMessage, installerFile);
+                return;
+            }
+
+            if (!isStep2Completed)
+            {
+                DoConfigureButton(
+                    isGluonMode, configureProgress);
+                return;
+            }
+
+            if (GUILayout.Button(PlasticLocalization.GetString(PlasticLocalization.Name.CreateWorkspace),
+                    GUILayout.Width(BUTTON_WIDTH)))
+                mIsCreateWorkspaceButtonClicked = true;
+        }
+
+        static void DoInstallButton(
+            ProgressControlsForViews downloadProgress,
+            GuiMessage.IGuiMessage guiMessage,
+            string installerFile)
+        {
+            GUI.enabled = !downloadProgress.ProgressData.IsOperationRunning;
+
+            if (GUILayout.Button(PlasticLocalization.GetString(PlasticLocalization.Name.InstallPlasticSCM),
+                    GUILayout.Width(BUTTON_WIDTH)))
+            {
+                Edition plasticEdition;
+                if (TryGetPlasticEditionToDownload(
+                        guiMessage, out plasticEdition))
+                {
+                    DownloadAndInstallOperation.Run(
+                        plasticEdition, installerFile,
+                        downloadProgress);
+
+                    GUIUtility.ExitGUI();
+                }
+            }
+
+            GUI.enabled = true;
+        }
+
+        static void DoConfigureButton(
+            bool isGluonMode,
+            ProgressControlsForViews configureProgress)
+        {
+            GUI.enabled = !configureProgress.ProgressData.IsOperationRunning;
+
+            if (GUILayout.Button(PlasticLocalization.GetString(PlasticLocalization.Name.LoginOrSignUp),
+                    GUILayout.Width(BUTTON_WIDTH)))
+            {
+                ConfigurePlasticOperation.Run(
+                    isGluonMode,
+                    configureProgress);
+
+                GUIUtility.ExitGUI();
+            }
+
+            GUI.enabled = true;
+        }
+
+        static void DoStepsArea(
+            bool isStep1Completed,
+            bool isStep2Completed,
+            ProgressControlsForViews.Data downloadProgressData,
+            ProgressControlsForViews.Data configureProgressData)
+        {
+            DoDownloadAndInstallStep(
+                isStep1Completed,
+                downloadProgressData);
+
+            DoLoginOrSignUpStep(
+                isStep2Completed,
+                configureProgressData);
+
+            DoCreatePlasticWorkspaceStep();
+        }
+
+        static void DoDownloadAndInstallStep(
+            bool isStep1Completed,
+            ProgressControlsForViews.Data progressData)
+        {
+            Images.Name stepImage = (isStep1Completed) ?
+                Images.Name.StepOk :
+                Images.Name.Step1;
+
+            string stepText = GetDownloadStepText(
+                progressData,
+                isStep1Completed);
+
+            GUIStyle style = new GUIStyle(EditorStyles.label);
+            style.richText = true;
+
+            GUILayout.BeginHorizontal();
+
+            DoStepLabel(
+                stepText,
+                stepImage,
+                style);
+
+            GUILayout.EndHorizontal();
+        }
+
+        static void DoLoginOrSignUpStep(
+            bool isStep2Completed,
+            ProgressControlsForViews.Data progressData)
+        {
+            Images.Name stepImage = (isStep2Completed) ?
+                Images.Name.StepOk :
+                Images.Name.Step2;
+
+            string stepText = GetConfigurationStepText(
+                progressData,
+                isStep2Completed);
+
+            GUIStyle style = new GUIStyle(EditorStyles.label);
+            style.richText = true;
+
+            GUILayout.BeginHorizontal();
+
+            DoStepLabel(
+                stepText,
+                stepImage,
+                style);
+
+            GUILayout.EndHorizontal();
+        }
+
+        static void DoCreatePlasticWorkspaceStep()
+        {
+            GUILayout.BeginHorizontal();
+
+            DoStepLabel(
+                PlasticLocalization.GetString(PlasticLocalization.Name.CreateAPlasticWorkspace),
+                Images.Name.Step3,
+                EditorStyles.label);
+
+            GUILayout.EndHorizontal();
+        }
+
+        static void DoStepLabel(
+            string text,
+            Images.Name imageName,
+            GUIStyle style)
+        {
+            GUILayout.Space(STEPS_LEFT_MARGIN);
+
+            GUIContent stepLabelContent = new GUIContent(
+                string.Format(" {0}", text),
+                Images.GetImage(imageName));
+
+            GUILayout.Label(
+                stepLabelContent,
+                style,
+                GUILayout.Height(STEP_LABEL_HEIGHT));
+        }
+
+        static void DoTitleLabel()
+        {
+            GUIContent labelContent = new GUIContent(
+                PlasticLocalization.GetString(PlasticLocalization.Name.NextStepsToSetup),
+                Images.GetInfoIcon());
+
+            GUILayout.Label(labelContent, EditorStyles.boldLabel);
+        }
+
+        static void DoNotificationArea(
+            ProgressControlsForViews.Data downloadProgressData,
+            ProgressControlsForViews.Data configureProgressData)
+        {
+            if (!string.IsNullOrEmpty(downloadProgressData.NotificationMessage))
+                DrawProgressForViews.ForNotificationArea(downloadProgressData);
+
+            if (!string.IsNullOrEmpty(configureProgressData.NotificationMessage))
+                DrawProgressForViews.ForNotificationArea(configureProgressData);
+        }
+
+        static string GetDownloadStepText(
+            ProgressControlsForViews.Data progressData,
+            bool isStep1Completed)
+        {
+            string result = PlasticLocalization.GetString(PlasticLocalization.Name.DownloadAndInstall);
+
+            if (isStep1Completed)
+                return result;
+
+            if (progressData.IsOperationRunning)
+                result = string.Format("<b>{0}</b>  -  ", result);
+
+            result += progressData.ProgressMessage;
+
+            if (progressData.IsOperationRunning && progressData.ProgressPercent >= 0)
+            {
+                result += string.Format(
+                    " {0}%", progressData.ProgressPercent * 100);
+            }
+
+            return result;
+        }
+
+        static string GetConfigurationStepText(
+            ProgressControlsForViews.Data progressData,
+            bool isStep2Completed)
+        {
+            string result = PlasticLocalization.GetString(PlasticLocalization.Name.LoginOrSignUpPlastic);
+
+            if (isStep2Completed)
+                return result;
+
+            if (!progressData.IsOperationRunning)
+                return result;
+
+            return string.Format("<b>{0}</b>", result);
+        }
+
+        static bool TryGetPlasticEditionToDownload(
+            GuiMessage.IGuiMessage guiMessage,
+            out Edition plasticEdition)
+        {
+            plasticEdition = Edition.Cloud;
+
+            if (EditionToken.IsCloudEdition())
+                return true;
+
+            GuiMessage.GuiMessageResponseButton result = guiMessage.ShowQuestion(
+                    PlasticLocalization.GetString(PlasticLocalization.Name.PlasticSCM),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.WhichVersionInstall),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.DownloadCloudEdition),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.DownloadEnterpriseEdition),
+                    PlasticLocalization.GetString(PlasticLocalization.Name.CancelButton),
+                    true);
+
+            if (result == GuiMessage.GuiMessageResponseButton.Third)
+                return false;
+
+            if (result == GuiMessage.GuiMessageResponseButton.First)
+                return true;
+
+            plasticEdition = Edition.Enterprise;
+            return true;
+        }
+
+        CreateWorkspaceView GetCreateWorkspaceView()
+        {
+            if (mCreateWorkspaceView != null)
+                return mCreateWorkspaceView;
+
+            string workspacePath = ProjectPath.FromApplicationDataPath(
+                Application.dataPath);
+
+            mCreateWorkspaceView = new CreateWorkspaceView(
+                mParentWindow,
+                mCreateWorkspaceListener,
+                mPlasticApi,
+                mPlasticWebRestApi,
+                workspacePath);
+
+            return mCreateWorkspaceView;
+        }
+
+        string mInstallerFile;
+        bool mIsCreateWorkspaceButtonClicked = false;
+
+        CreateWorkspaceView mCreateWorkspaceView;
+
+        readonly ProgressControlsForViews mDownloadProgress;
+        readonly ProgressControlsForViews mConfigureProgress;
+        readonly GuiMessage.IGuiMessage mGuiMessage;
+        readonly PlasticAPI mPlasticApi;
+        readonly IPlasticWebRestApi mPlasticWebRestApi;
+        readonly CreateWorkspaceView.ICreateWorkspaceListener mCreateWorkspaceListener;
+        readonly EditorWindow mParentWindow;
+
+        const int LEFT_MARGIN = 30;
+        const int TOP_MARGIN = 20;
+        const int STEPS_TOP_MARGIN = 5;
+        const int STEPS_LEFT_MARGIN = 12;
+        const int BUTTON_MARGIN = 10;
+        const int STEP_LABEL_HEIGHT = 20;
+        const int BUTTON_WIDTH = 170;
+
+        const string DOWNLOAD_URL = @"https://www.plasticscm.com/download";
+    }
+}
diff --git a/Editor/PlasticSCM/Views/Welcome/WelcomeView.cs.meta b/Editor/PlasticSCM/Views/Welcome/WelcomeView.cs.meta
new file mode 100644
index 0000000..d5ecf4a
--- /dev/null
+++ b/Editor/PlasticSCM/Views/Welcome/WelcomeView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a9298a2c04dfc944bbc6ea156f4e2104
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/WebApi.meta b/Editor/PlasticSCM/WebApi.meta
new file mode 100644
index 0000000..0889677
--- /dev/null
+++ b/Editor/PlasticSCM/WebApi.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 73d911d9a41870c47a8442b59375b4c6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/WebApi/CredentialsResponse.cs b/Editor/PlasticSCM/WebApi/CredentialsResponse.cs
new file mode 100644
index 0000000..4b24802
--- /dev/null
+++ b/Editor/PlasticSCM/WebApi/CredentialsResponse.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+
+using Newtonsoft.Json;
+
+using PlasticGui.WebApi.Responses;
+
+namespace Unity.PlasticSCM.Editor.WebApi
+{
+    [ObfuscationAttribute(Exclude = true)]
+    public class CredentialsResponse
+    {
+        [JsonProperty("error")]
+        public ErrorResponse.ErrorFields Error { get; set; }
+
+        public enum TokenType : int
+        {
+            Password = 0,
+            Bearer = 1,
+        }
+
+        [JsonIgnore]
+        public TokenType Type
+        {
+            get { return (TokenType)TokenTypeValue; }
+        }
+
+        [JsonProperty("email")]
+        public string Email;
+        [JsonProperty("token")]
+        public string Token;
+        [JsonProperty("tokenTypeValue")]
+        public int TokenTypeValue;
+    }
+}
diff --git a/Editor/PlasticSCM/WebApi/CredentialsResponse.cs.meta b/Editor/PlasticSCM/WebApi/CredentialsResponse.cs.meta
new file mode 100644
index 0000000..cf3fbcb
--- /dev/null
+++ b/Editor/PlasticSCM/WebApi/CredentialsResponse.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d1c46ccb760d06146a24b7e265e19566
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/WebApi/PlasticScmRestApiClient.cs b/Editor/PlasticSCM/WebApi/PlasticScmRestApiClient.cs
new file mode 100644
index 0000000..8d7d840
--- /dev/null
+++ b/Editor/PlasticSCM/WebApi/PlasticScmRestApiClient.cs
@@ -0,0 +1,140 @@
+using System;
+using System.IO;
+using System.Net;
+
+using Newtonsoft.Json;
+
+using Codice.Client.Common.WebApi;
+using Codice.CM.Common;
+using Codice.LogWrapper;
+using PlasticGui.Help.NewVersions;
+using PlasticGui.WebApi.Responses;
+
+namespace Unity.PlasticSCM.Editor.WebApi
+{
+    internal static class PlasticScmRestApiClient
+    {
+        internal static UnityPackageBetaEnrollResponse IsBetaEnabled(string bearerToken)
+        {
+            Uri endpoint = mWebApiUris.GetFullUri(IsBetaEnabledEndpoint);
+
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(endpoint);
+                request.Method = "GET";
+                request.ContentType = "application/json";
+                request.Headers.Add(
+                    HttpRequestHeader.Authorization,
+                    string.Format("Bearer {0}", bearerToken));
+
+                return GetResponse<UnityPackageBetaEnrollResponse>(request);
+            }
+            catch (Exception ex)
+            {
+                mLog.ErrorFormat(
+                    "Unable to retrieve is beta enabled '{0}': {1}",
+                    endpoint.ToString(), ex.Message);
+
+                mLog.DebugFormat(
+                    "StackTrace:{0}{1}",
+                    Environment.NewLine, ex.StackTrace);
+
+                return null;
+            }
+        }
+
+        internal static NewVersionResponse GetLastVersion(Edition plasticEdition)
+        {
+            Uri endpoint = mWebApiUris.GetFullUri(
+                    WebApiEndpoints.LastVersion.NewVersion,
+                    "9.0.0.0",
+                    WebApiEndpoints.LastVersion.GetEditionString(plasticEdition),
+                    WebApiEndpoints.LastVersion.GetPlatformString());
+
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(endpoint);
+                request.Method = "GET";
+                request.ContentType = "application/json";
+
+                return GetResponse<NewVersionResponse>(request);
+            }
+            catch (Exception ex)
+            {
+                mLog.ErrorFormat(
+                    "Unable to retrieve new versions from '{0}': {1}",
+                    endpoint.ToString(), ex.Message);
+
+                mLog.DebugFormat(
+                    "StackTrace:{0}{1}",
+                    Environment.NewLine, ex.StackTrace);
+
+                return null;
+            }
+        }
+
+        internal static CredentialsResponse GetCredentials(string unityToken)
+        {
+            Uri endpoint = mWebApiUris.GetFullUri(
+                WebApiEndpoints.Authentication.Credentials,
+                unityToken);
+
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(endpoint);
+                request.Method = "GET";
+                request.ContentType = "application/json";
+
+                return GetResponse<CredentialsResponse>(request);
+            }
+            catch (Exception ex)
+            {
+                return new CredentialsResponse
+                {
+                    Error = BuildLoggedErrorFields(ex, endpoint)
+                };
+            }
+        }
+
+        static TRes GetResponse<TRes>(WebRequest request)
+        {
+            using (WebResponse response = request.GetResponse())
+            using (StreamReader reader = new StreamReader(response.GetResponseStream()))
+            {
+                string json = reader.ReadToEnd();
+
+                if (string.IsNullOrEmpty(json))
+                    return default(TRes);
+
+                return JsonConvert.DeserializeObject<TRes>(json);
+            }
+        }
+
+        static ErrorResponse.ErrorFields BuildLoggedErrorFields(
+            Exception ex, Uri endpoint)
+        {
+            LogException(ex, endpoint);
+
+            return new ErrorResponse.ErrorFields
+            {
+                ErrorCode = ErrorCodes.ClientError,
+                Message = ex.Message
+            };
+        }
+
+        static void LogException(Exception ex, Uri endpoint)
+        {
+            mLog.ErrorFormat(
+                "There was an error while calling '{0}': {1}",
+                endpoint.ToString(), ex.Message);
+
+            mLog.DebugFormat(
+                "StackTrace:{0}{1}",
+                Environment.NewLine, ex.StackTrace);
+        }
+
+        const string IsBetaEnabledEndpoint = "api/unity-package/beta/is-enabled";
+        static readonly PlasticWebApiUris mWebApiUris = PlasticWebApiUris.BuildDefault();
+        static readonly ILog mLog = LogManager.GetLogger("PlasticScmRestApiClient");
+    }
+}
diff --git a/Editor/PlasticSCM/WebApi/PlasticScmRestApiClient.cs.meta b/Editor/PlasticSCM/WebApi/PlasticScmRestApiClient.cs.meta
new file mode 100644
index 0000000..a3d3874
--- /dev/null
+++ b/Editor/PlasticSCM/WebApi/PlasticScmRestApiClient.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e57a1c5d3e1c8844eb3893fed51c9727
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/PlasticSCM/WebApi/UnityPackageBetaEnrollResponse.cs b/Editor/PlasticSCM/WebApi/UnityPackageBetaEnrollResponse.cs
new file mode 100644
index 0000000..72e8536
--- /dev/null
+++ b/Editor/PlasticSCM/WebApi/UnityPackageBetaEnrollResponse.cs
@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+
+using PlasticGui.WebApi.Responses;
+
+namespace Unity.PlasticSCM.Editor.WebApi
+{
+    public class UnityPackageBetaEnrollResponse
+    {
+        [JsonProperty("error")]
+        public ErrorResponse.ErrorFields Error { get; set; }
+        [JsonProperty("isBetaEnabled")]
+        public bool IsBetaEnabled { get; set; }
+    }
+}
diff --git a/Editor/PlasticSCM/WebApi/UnityPackageBetaEnrollResponse.cs.meta b/Editor/PlasticSCM/WebApi/UnityPackageBetaEnrollResponse.cs.meta
new file mode 100644
index 0000000..f66b90f
--- /dev/null
+++ b/Editor/PlasticSCM/WebApi/UnityPackageBetaEnrollResponse.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bb7d7728d367d55439d350f9751d05d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/LICENSE.md b/LICENSE.md
index 01eff0f..074594e 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Unity Collaborate copyright © 2020 Unity Technologies ApS
+Unity Collaborate copyright © 2021 Unity Technologies ApS
 
 Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License).
 
diff --git a/Lib.meta b/Lib.meta
new file mode 100644
index 0000000..4c45a9a
--- /dev/null
+++ b/Lib.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: dc0f0050d6c104fc7b2b61ca838fd8c6
+folderAsset: yes
+timeCreated: 1540458049
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor.meta b/Lib/Editor.meta
new file mode 100644
index 0000000..a457fbf
--- /dev/null
+++ b/Lib/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7a5a6b0b4d8d6d6428e297651ac42235
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM.meta b/Lib/Editor/PlasticSCM.meta
new file mode 100644
index 0000000..517bb3b
--- /dev/null
+++ b/Lib/Editor/PlasticSCM.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e37a9c7a8e0383d4b87c58b1fae01778
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/FileSystemWatcherLicense.txt b/Lib/Editor/PlasticSCM/FileSystemWatcherLicense.txt
new file mode 100644
index 0000000..1b2181e
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/FileSystemWatcherLicense.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation
+
+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.
\ No newline at end of file
diff --git a/Lib/Editor/PlasticSCM/FileSystemWatcherLicense.txt.meta b/Lib/Editor/PlasticSCM/FileSystemWatcherLicense.txt.meta
new file mode 100644
index 0000000..0985683
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/FileSystemWatcherLicense.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 992242bf8b23e574bbc95a128844c481
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll b/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll
new file mode 100644
index 0000000..245c1bd
Binary files /dev/null and b/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll differ
diff --git a/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll.meta b/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll.meta
new file mode 100644
index 0000000..f876bc9
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll.meta
@@ -0,0 +1,30 @@
+fileFormatVersion: 2
+guid: f3cad5fee9fee5945b13e7e3518afb1b
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/liblz4Plastic.dylib b/Lib/Editor/PlasticSCM/liblz4Plastic.dylib
new file mode 100644
index 0000000..0762c92
Binary files /dev/null and b/Lib/Editor/PlasticSCM/liblz4Plastic.dylib differ
diff --git a/Lib/Editor/PlasticSCM/liblz4Plastic.dylib.meta b/Lib/Editor/PlasticSCM/liblz4Plastic.dylib.meta
new file mode 100644
index 0000000..6db2c9b
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/liblz4Plastic.dylib.meta
@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: 3313b144884b41f4a86de6fda5eed953
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/localization.meta b/Lib/Editor/PlasticSCM/localization.meta
new file mode 100644
index 0000000..8f77fc3
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/localization.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b057986d22277594c990e51bc07c5468
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/localization/plastic-gui.en.txt b/Lib/Editor/PlasticSCM/localization/plastic-gui.en.txt
new file mode 100644
index 0000000..cc1731c
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/localization/plastic-gui.en.txt
@@ -0,0 +1,6818 @@
+== Branch ==
+Branch
+
+== Changeset ==
+Changeset
+
+== ChangesetLowercase ==
+changeset
+
+== ChangesetsLowercase ==
+changesets
+
+== Label ==
+Label
+
+== Server ==
+Server
+
+== Workspace ==
+Workspace
+
+== Repository ==
+Repository
+
+== Checkin ==
+Checkin
+
+== UndoChanges ==
+Undo Changes
+
+== UpdateWorkspace ==
+Update workspace
+
+== UpdateWorkspaceAmp ==
+&Update workspace
+
+== ItemsMenuUndoCheckout ==
+Undo checkout
+
+== ItemsMenuUndoChanges ==
+Undo changes
+
+== ItemsMenuChangeRevType ==
+Change revision type
+
+== MenuItemExternalTools ==
+External tools
+
+== ItemNameEmpty ==
+The name cannot be empty
+
+== ItemExists ==
+The item {0} already exists
+
+== MovingItems ==
+Moving items...
+
+== Options ==
+Options
+
+== OptionsAmp ==
+&Options
+
+== BranchExplorerOptionsTooltip ==
+Show the options panel
+
+== BranchExplorerOptionsToggleTooltip ==
+Hide or show the options panel
+
+== GoButton ==
+Go
+
+== GoToBranchBase ==
+Go to branch base
+
+== BranchExplorerMenu ==
+Branch Explorer
+
+== FilterSelectedBranches ==
+Filter selected branches
+
+== FilterSelectedAndRelatedBranches ==
+Filter selected and related branches
+
+== FilterSelectedBranchesPendingMerges ==
+Filter pending merges for selected branches
+
+== GoToParentChangeset ==
+Go to parent changeset
+
+== AddInclusion ==
+Add inclusion
+
+== AddExclusion ==
+Add exclusion
+
+== CustomBranchQuery ==
+Custom branch query rule
+
+== CustomChangesetQuery ==
+Custom changeset query rule
+
+== CustomLabelQuery ==
+Custom label query rule
+
+== ConditionalBranchFormatText ==
+New conditional branch format (branches to be highlighted)
+
+== ConditionalChangesetFormatText ==
+New conditional changeset format (changesets to be highlighted)
+
+== ConditionalLabelFormatText ==
+New conditional label format (labels to be highlighted)
+
+== InclusionRuleText ==
+New inclusion branch filter (branches to be included)
+
+== ExclusionRuleText ==
+New exclusion branch filter (branches to be excluded)
+
+== ActiveBranch ==
+Active branch in the workspace
+
+== ActiveBranches ==
+Active branches in the workspace
+
+== BranchesWithPendingIntegrations ==
+Branches with pending merges
+
+== AddFormat ==
+Add format
+
+== Calculating ==
+Calculating...
+
+== CopyrightTextFormat ==
+Copyright © 2006-{0} Codice Software S.L. All Rights Reserved.
+
+== FiltersAndConditionalFormat ==
+Filters & format
+
+== VisitUsText ==
+Visit us at
+
+== MeetUsText ==
+Meet us at
+
+== ReleaseText ==
+Release:
+
+== ReleaseNotesLinkText ==
+Release Notes
+
+== WebsiteLink ==
+https://www.plasticscm.com
+
+== MeetUsLink ==
+https://www.plasticscm.com/company/team
+
+== ReleaseNotesUrlPreffix ==
+https://www.plasticscm.com/download/releasenotes/
+
+== DesignedInText ==
+Designed in Boecillo Park (Valladolid), Spain
+
+== RevertStart ==
+Reverting the revision in the workspace...
+
+== RevertingItemsSingular ==
+Reverting 1 item...
+
+== RevertingItemsPlural ==
+Reverting {0} items...
+
+== RevertingProgress ==
+Reverting file {0} of {1}: {2}
+
+== Validating ==
+Validating data...
+
+== UpdateReportNoLinesSelected ==
+Please select the paths you want to update
+
+== UpdateProgressCalculating ==
+Calculating...
+
+== UpdateProgressUpdating ==
+Updating...
+
+== UpdateProgressSingular ==
+Updated {0} of {1} ({2} of 1 file){4}
+
+== UpdateProgressPlural ==
+Updated {0} of {1} ({2} of {3} files){4}
+
+== CheckinComments ==
+Checkin comments
+
+== UpdatingSelectedItems ==
+Updating the selected items...
+
+== LoadingItems ==
+Loading items...
+
+== LoadingBranches ==
+Loading branches...
+
+== LoadingBranchExplorer ==
+Loading Branch Explorer...
+
+== LoadingLabels ==
+Loading labels...
+
+== LoadingChangesets ==
+Loading changesets...
+
+== LoadingShelves ==
+Loading shelves...
+
+== LoadingSyncViewDetails ==
+Loading sync view details...
+
+== LoadingDeletedItems ==
+Loading deleted items...
+
+== UncheckoutStart ==
+Unchecking out selected items...
+
+== ActionMenuButtonTooltip ==
+Perform actions to the selected item
+
+== MainSidebarMainActionsItem ==
+Main Actions
+
+== MainSidebarItemsItem ==
+Workspace Explorer
+
+== MainSidebarPendingChangesItem ==
+Pending Changes
+
+== MainSidebarCheckinItem ==
+Checkin
+
+== MainSidebarBranchesItem ==
+Branches
+
+== MainSidebarBranchExplorerItem ==
+Branch Explorer
+
+== MainSidebarChangesetsItem ==
+Changesets
+
+== MainSidebarLabelsItem ==
+Labels
+
+== MainSidebarAttributesItem ==
+Attributes
+
+== MainSidebarSyncItem ==
+Sync Repositories
+
+== MainSidebarSyncItemCloudEdition ==
+Sync to Cloud
+
+== MainSidebarCloudItem ==
+Cloud
+
+== MainSidebarMergeItem ==
+Merge
+
+== MainSidebarIncomingChangesItem ==
+Incoming Changes
+
+== MainSidebarPreferencesItem ==
+Preferences
+
+== MainSidebarAboutItem ==
+About Plastic SCM
+
+== MainSidebarAboutGluonItem ==
+About Gluon
+
+== MainSidebarRepositoriesItem ==
+Repositories
+
+== MainSidebarWorkspacesItem ==
+Workspaces
+
+== MainSidebarCodeReviewsItem ==
+Code Reviews
+
+== ItemColumn ==
+Item
+
+== StatusColumn ==
+Status
+
+== ExtensionColumn ==
+Extension
+
+== TypeColumn ==
+Type
+
+== DateModifiedColumn ==
+Date modified
+
+== RepositoryColumn ==
+Repository
+
+== ServerColumn ==
+Server
+
+== ObjectNameColumn ==
+Object name
+
+== NameColumn ==
+Name
+
+== PathColumn ==
+Path
+
+== ProblemColumn ==
+Problem
+
+== SeverityColumn ==
+Severity
+
+== TimestampColumn ==
+Timestamp
+
+== LastEditedByColumn ==
+Last edited by
+
+== CreationDateColumn ==
+Creation date
+
+== GuidColumn ==
+Guid
+
+== CommentColumn ==
+Comment
+
+== ChangedItemsSelectedSingular ==
+Changed items - {0} of 1 item selected
+
+== ChangedItemsSelectedPlural ==
+Changed items - {0} of {1} items selected
+
+== AddedPrivateItemsSelectedSingular ==
+Added and private - {0} of 1 item selected
+
+== AddedPrivateItemsSelectedPlural ==
+Added and private - {0} of {1} items selected
+
+== DeletedItemsSelectedSingular ==
+Deleted items - {0} of 1 item selected
+
+== DeletedItemsSelectedPlural ==
+Deleted items - {0} of {1} items selected
+
+== MovedItemsSelectedSingular ==
+Moved items - {0} of 1 item selected
+
+== MovedItemsSelectedPlural ==
+Moved items - {0} of {1} items selected
+
+== DeletingObjectsSingular ==
+Deleting 1 object
+
+== DeletingObjectsPlural ==
+Deleting {0} objects
+
+== DeleteObjectsSingular ==
+Deleting 1 object. Are you sure?
+
+== DeleteObjectsPlural ==
+Deleting {0} objects. Are you sure?
+
+== ConfirmDeletionTitle ==
+Confirm deletion
+
+== ConfirmRevertTitle ==
+Confirm revert
+
+== ConfirmRevertMessage ==
+Contents will be reverted to revision {0}. Continue?
+
+== ConfirmRevertToClientDiffsMessage ==
+The selected files will be reverted. Continue?
+
+== ConfirmUndeleteTitle ==
+Confirm undelete
+
+== ConfirmUndeleteMessage ==
+The selected files will be undeleted. Continue?
+
+== FromTo ==
+{0} to {1}
+
+== From ==
+from
+
+== To ==
+to
+
+== AddProgress ==
+Adding items...
+
+== CheckoutProgress ==
+Checking out items...
+
+== UndoingPendingChanges ==
+Undoing changes...
+
+== UndoingUnchanged ==
+Undoing unchanged items...
+
+== ShelvingPendingChanges ==
+Shelving changes...
+
+== UndoingChangedFiles ==
+Undoing changes...
+
+== UndoingChangedFilesError ==
+Some error has occurred during the undo changes operation:
+
+== New ==
+New...
+
+== ItemsMenuItemHistory ==
+History
+
+== ItemsMenuItemAnnotate ==
+Annotate
+
+== NoItemsAreSelected ==
+No items are selected. Use the items' checkboxes to select them. This can also occur if you have selected items, but they are all ignored.
+
+== EmptyComments ==
+The comment field is empty. Don't forget to add a checkin comment before creating a new changeset.
+
+== RepositoryNameLabel ==
+Name of the new repository:
+
+== WorkspaceNameLabel ==
+Name of the new workspace:
+
+== NewRepositoryTitle ==
+Create a new repository
+
+== RenameRepositoryTitle ==
+Rename Repository
+
+== NewWorkspace ==
+Create a new workspace
+
+== RenameWorkspaceTitle ==
+Rename Workspace
+
+== NewWorkspaceNameLabel ==
+New name of the workspace:
+
+== RepositoryServerLabel ==
+Server (your_server:8087 or your_org@cloud):
+
+== WorkspacePathLabel ==
+Path on disk:
+
+== RepositoryLabel ==
+Repository:
+
+== BrowseLabel ==
+Browse...
+
+== LocalChangesApplierProgressProcessingNeededPaths ==
+Processing needed paths
+
+== CheckinAutoUpdateMergeRequest ==
+New files in the branch, update needed.
+
+== CheckinAutoUpdateMergeRequestMessage ==
+New changes appeared in the branch that you are working on after you started your own changes in the workspace. You need to get these changes into your workspace before checking in your changes.
+      
+Since the changes in the branch don't conflict with your changes in the workspace, you can simply update the workspace before checking in. 
+      
+Do you want to update the workspace and checkin your changes now?
+
+== UpdateWorkspaceMergeRequest ==
+Conflicts detected before updating
+
+== UpdateWorkspaceMergeRequestMessage ==
+Some files you have changed in your workspace were modified as well in the branch and you need to merge them before continuing. 
+
+A merge view will open so that you can merge the items with conflicts. Please resolve them and then proceed with the update.
+
+== CheckinMergeRequest ==
+Checkin on this branch cannot proceed. 
+
+== CheckinMergeRequestMessage ==
+Other changes were checked in while you were making your changes.
+
+== CheckinMergeRequestQuestion ==
+A merge is needed in order to continue. How would you like to proceed?
+
+== CheckinMergeNow ==
+Merge now
+
+== RepositoryServerEmpty ==
+Repository server must not be empty
+
+== CouldNotGetOrganizationNameFromCredentials ==
+Invalid credentials. Couldn't get the organization name
+
+== CouldNotGetOrganizationName == 
+Unable to get the organization name from the cloud server. Maybe your credentials are wrong. Please run again the configuration tool to enter new credentials ('{0} --configure')
+
+== RepositoryServerIsNotAvailable ==
+The repository server is not available
+
+== RepositoryNameEmpty ==
+Repository name must not be empty
+
+== WorkspaceNameEmpty ==
+Workspace name must not be empty
+
+== WorkspacePathEmpty ==
+Workspace path must not be empty
+
+== WorkspacePathUnauthorizedAccess ==
+Unauthorized access to create the workspace in the specified path
+
+== InvalidCharsInPath ==
+Workspace path contains invalid characters
+
+== WorkspaceNameAlreadyExists ==
+The workspace {0} already exists
+
+== WorkspacePathAlreadyUsed ==
+The path {0} is already contained in a workspace
+
+== CheckinMergeNowMessage ==
+Stop the checkin. Show a dialog to merge the other changes with your changes. You can then proceed again with the original checkin.
+
+== CheckinMergeLater ==
+Merge later (checkin my changes in a child branch)
+
+== CheckinMergeLaterMessage ==
+Continue the checkin. Create a child branch of {0} and save your changes to that branch. Later, you can merge the child branch back to the current branch.
+
+== CheckinMergeBranch ==
+Name for child branch
+
+== RepositoryMenuItemCreate ==
+Create new repository...
+
+== RepositoryMenuItemCreateWorkspace ==
+Create workspace for this repository...
+
+== RenameMenuItem ==
+Rename
+
+== WorkspaceMenuItemOpen ==
+Open
+
+== WorkspaceMenuItemOpenAmp ==
+&Open
+
+== WorkspaceMenuItemOpenInNewWindow ==
+Open in a new window
+
+== WorkspaceMenuItemOpenInNewWindowAmp ==
+Open in a &new window
+
+== WorkspaceMenuItemOpenWith ==
+Open with...
+
+== OpenInExplorerMenuItem ==
+Open in explorer
+
+== DeleteMenuItem ==
+Delete
+
+== UndeleteMenuItem ==
+Undelete
+
+== WorkspaceMenuItemCreate ==
+Create a new workspace...
+
+== WorkspaceMenuItemCreateAmp ==
+&Create a new workspace...
+
+== WorkspaceMenuItemRename ==
+Rename
+
+== WorkspaceMenuItemRenameAmp ==
+Rena&me
+
+== WorkspaceMenuItemDelete ==
+Delete
+
+== WorkspaceMenuItemDeleteAmp ==
+&Delete
+
+== BranchMenuItemCreateBranch ==
+Create child branch...
+
+== BranchMenuItemMergeFromBranch ==
+Merge from this branch...
+
+== BranchMenuItemAdvancedMerge ==
+Advanced merge
+
+== BranchMenuItemCherrypickFromBranch ==
+Cherry pick from this branch...
+
+== BranchMenuItemMergeToFromBranch ==
+Merge from this branch to...
+
+== BranchMenuItemPushPull ==
+Push/Pull
+
+== BranchMenuItemPullBranch ==
+Pull this branch...
+
+== BranchMenuItemPullRemoteBranch ==
+Pull remote branch...
+
+== BranchMenuItemSyncWithGit ==
+Sync with Git...
+
+== BranchMenuItemPushBranch ==
+Push this branch...
+
+== BranchMenuItemRenameBranch ==
+Rename...
+
+== BranchMenuItemDeleteBranch ==
+Delete
+
+== BranchMenuItemSwitchToBranch ==
+Switch workspace to this branch
+
+== BranchMenuItemDiff ==
+Diff branch
+
+== BranchMenuItemDiffWithAnotherBranch ==
+Diff with another branch...
+
+== BranchMenuItemViewChangesets ==
+View changesets in this branch
+
+== ChangesetMenuItemCreateBranch ==
+Create branch from this changeset...
+
+== ChangesetMenuChangesetDiff ==
+Diff changeset
+
+== ChangesetMenuItemDiff ==
+Diff with previous
+
+== ChangesetMenuItemDiffWithAnother ==
+Diff with another changeset...
+
+== ChangesetMenuItemDiffSelected ==
+Diff selected changesets
+
+== ChangesetMenuItemBrowseRepositoryOnChangeset ==
+Browse repository in this changeset
+
+== ChangesetMenuItemLabelChangeset ==
+Label this changeset...
+
+== ChangesetMenuItemSwitchToChangeset ==
+Switch workspace to this changeset
+
+== ChangesetMenuItemMergeFromChangeset ==
+Merge from this changeset...
+
+== ChangesetMenuItemCherrypickFromChangeset ==
+Cherry pick from this changeset...
+
+== ChangesetMenuItemAdvancedMerge ==
+Advanced merge
+
+== ChangesetMenuItemSubtractiveFromChangeset ==
+Subtractive merge from this changeset...
+
+== ChangesetMenuItemSubtractiveFromChangesetInterval ==
+Subtractive merge from this changeset interval...
+
+== ChangesetMenuItemCherrypickFromChangesetInterval ==
+Cherry pick from this changeset interval...
+
+== ChangesetMenuItemMergeToFromChangeset ==
+Merge from this changeset to...
+
+== ChangesetMenuItemAdvancedOptions ==
+Advanced options
+
+== ChangesetMenuItemMoveChangeset ==
+Move from this changeset to a different branch...
+
+== ChangesetMenuItemDeleteChangeset ==
+Delete changeset
+
+== CheckoutChangesetMenuItemShowPendingChangesView ==
+Show pending changes view
+
+== LabelMenuItemCreateLabel ==
+Create new label...
+
+== LabelMenuItemApplyLabelToWorkspace ==
+Apply label to workspace content
+
+== LabelMenuItemSwitchToLabel ==
+Switch workspace to this label
+
+== LabelMenuItemMergeFromLabel ==
+Merge from this label...
+
+== LabelMenuItemMergeToFromLabel ==
+Merge from this label to...
+
+== LabelMenuItemCreateBranchFromLabel ==
+Create branch from this label...
+
+== LabelMenuItemRenameLabel ==
+Rename...
+
+== LabelMenuItemDeleteLabel ==
+Delete
+
+== ShelveMenuItemViewShelve ==
+View shelve
+
+== ShelveMenuItemApplyShelveInWorkspace ==
+Apply shelve in my workspace...
+
+== ShelveMenuItemDeleteShelve ==
+Delete
+
+== AttributeMenuItemCreate ==
+Create
+
+== AttributeMenuItemEdit ==
+Edit
+
+== AttributeMenuItemDelete ==
+Delete
+
+== PendingChangesMenuItemOpen ==
+Open
+
+== PendingChangesMenuItemOpenWith ==
+Open with...
+
+== PendingChangesMenuItemDiffAnnotateHistory ==
+Diff / Annotate / History
+
+== PendingChangesMenuItemDiffWorkspace ==
+Diff workspace contents
+
+== PendingChangesMenuItemAnnotate ==
+Annotate
+
+== PendingChangesMenuItemViewHistory ==
+History
+
+== PendingChangesMenuItemUndoChanges ==
+Undo changes
+
+== PendingChangesMenuItemDelete ==
+Delete
+
+== PendingChangesMenuItemCheckout ==
+Checkout
+
+== PendingChangesMenuItemSearchMatches ==
+Search matches...
+
+== PendingChangesMenuItemHideIgnoreCloak ==
+Hide / Ignore / Cloak
+
+== PendingChangesMenuItemHideIgnore ==
+Hide / Ignore
+
+== DirectoryConflictsTitleSingular ==
+1 directory conflict
+
+== DirectoryConflictsTitlePlural ==
+{0} directory conflicts
+
+== FileConflictsTitleSingular ==
+1 file conflict
+
+== FileConflictsTitlePlural ==
+{0} file conflicts
+
+== NoActionMenuItem ==
+No action available
+
+== ItemsMenuItemNew ==
+New
+
+== ItemsMenuItemNewDirectory ==
+Directory...
+
+== ItemsMenuItemNewFile ==
+File...
+
+== ItemsMenuAdd ==
+Add to source control
+
+== ItemsMenuAddRecursive ==
+Add directory tree to source control
+
+== ItemsMenuCheckin ==
+Checkin
+
+== ItemsMenuItemOpen ==
+Open
+
+== ItemsMenuItemOpenWith ==
+Open with...
+
+== ItemsMenuItemOpenWithCustom ==
+Open with {0}
+
+== ItemsMenuItemRevealInFinder ==
+Reveal in Finder
+
+== ItemsMenuItemCut ==
+Cut
+
+== ItemsMenuItemDelete ==
+Delete...
+
+== ItemsMenuItemPaste ==
+Paste
+
+== ItemsMenuItemCreateXlink ==
+Create Xlink...
+
+== ItemsMenuItemEditXlink ==
+Edit Xlink...
+
+== BrowseRepositoryMenuItemOpen ==
+Open
+
+== BrowseRepositoryMenuItemOpenWith ==
+Open with...
+
+== BrowseRepositoryMenuItemDiffWithPrevious ==
+Diff with previous revision
+
+== BrowseRepositoryMenuItemSaveAs ==
+Save as...
+
+== BrowseRepositoryMenuItemViewHistory ==
+View history
+
+== HistoryMenuItemOpen ==
+Open
+
+== HistoryMenuItemOpenWith ==
+Open with...
+
+== HistoryMenuItemSaveRevisionAs ==
+Save this revision as...
+
+== HistoryMenuItemDiffWithPrevious ==
+Diff with previous revision
+
+== HistoryMenuItemDiffSelectedRevisions ==
+Diff selected revisions
+
+== HistoryMenuItemDiffChangeset ==
+Diff changeset
+
+== HistoryMenuItemRevertToThisRevision ==
+Revert file to this revision
+
+== RenameDialogTitleSingular ==
+Rename item
+
+== RenameDialogTitlePlural ==
+Rename items
+
+== RenameDialogDescription ==
+Enter new name: 
+
+== ItemsMenuItemRename ==
+Rename...
+
+== ItemsMenuItemDiffWithPrevious ==
+Diff with previous revision
+
+== ListViewMenuItem ==
+View as a list
+
+== TreeViewMenuItem ==
+View as a tree
+
+== HidePrivateItems ==
+Hide private items
+
+== ExcludePrivateItemsSize ==
+Exclude privates from directory size
+
+== AutomaticMergesTitleSingular ==
+1 automatic merge
+
+== AutomaticMergesTitlePlural ==
+{0} automatic merges
+
+== MergeExplanationTitle ==
+Merge explanation
+
+== MergeWithPendingChangesTitle ==
+Changed files detected
+
+== MergeWithPendingChangesMessage ==
+You have changes pending that need to be checked in into your workspace. It is recommended that you checkin prior to merge to avoid possible issues undoing merges. 
+If you are familiar with merge, you can change this behavior by going to Preferences / Diff and merge / Allow to merge with pending changes. 
+
+Note: We changed this behavior to avoid issues for new users, although it is not hazardous to enable it if you are familiar with how merge works.
+
+== MergeNotificationMessageTitle ==
+Notification message
+
+== BaseContributor ==
+Base
+
+== SrcContributor ==
+Source
+
+== DstContributor ==
+Destination
+
+== DeleteDialogTitleSingular ==
+Delete item
+
+== DeleteDialogTitlePlural ==
+Delete items
+
+== DeleteFromDiskSingular ==
+Delete item from disk
+
+== DeleteFromDiskPlural ==
+Delete items from disk
+
+== DoNotDeleteFromDiskSingular ==
+Do not delete item from disk
+
+== DoNotDeleteFromDiskPlural ==
+Do not delete items from disk
+
+== DeletingProgress ==
+Deleting {0}...
+
+== RemoveFromVersionControlSingular ==
+Remove item from version control
+
+== RemoveFromVersionControlPlural ==
+Remove items from version control
+
+== DiscardedConflictsTitleSingular ==
+1 discarded conflict
+
+== DiscardedConflictsTitlePlural ==
+{0} discarded conflicts
+
+== DirectoryConflictsCaption ==
+These are conflicts in the directory structure. Typically involve moves, renames, deletes. They must be solved before applying other changes.
+
+== DirectoryConflictsUnsolvedCaptionSingular ==
+directory conflict to solve.
+
+== DirectoryConflictsUnsolvedCaptionPlural ==
+directory conflicts to solve.
+
+== MergeAlreadyConnected ==
+The merge search has finished; merge destination already contains source changes.
+
+== MergeAlreadySubtracted ==
+The merge search has finished; merge source was already subtracted from the destination.
+
+== MergeInvalidInterval ==
+The merge search has finished; the given interval is not valid.
+
+== MergeNoMergesDetected ==
+The merge search has finished. No items to merge were detected.
+
+== MergeNoMergesDetectedCreateLink ==
+The merge search has finished. No items to merge were detected, however the source and destination contributors are different. This is normally the case when the exact same changes were made in source and destination. 
+
+Click the "Explain merge" button to see more details on the contributors involved. 
+
+Click the "Apply changes" button to unify the source and destination (creating a merge link between them). 
+
+
+== MergeNoMergesDetectedCreateLinkForIncomingView ==
+Nothing to download
+
+Just click "Update workspace" to move your workspace to the head of the branch.
+
+
+Detailed explanation: Your changes match the ones done in the head of the branch, so there is really nothing to download, but metadata needs to be synchronized.
+
+
+== MergeNothingToDownloadForIncomingView ==
+Nothing to download
+
+
+== MergeNotConnected ==
+The merge search has finished; subtractive merge source and destination are not connected.
+
+== MergeAlreadyProcessed ==
+Merge finished. Your changes are displayed ​on the pending changes view. Close this view and you will see them!
+
+== FileMergeTitleSingular ==
+1 change to apply
+
+== FileMergeTitlePlural ==
+{0} changes to apply
+
+== MergeChangedOnSrc ==
+Changes only in source contributor
+
+== MergeChangedOnSrcForIncomingView ==
+Will update
+
+== MergeWarningsTitleSingular ==
+1 discarded conflict.
+
+== MergeWarningsTitlePlural ==
+{0} discarded conflicts.
+
+== MergeWarningsCaption ==
+Conflicts that no longer apply and possible warnings.
+
+== DeleteDeleteWarningMessageSingular ==
+Deleted in the source of the merge, but also deleted on destination (1 item)
+
+== DeleteDeleteWarningMessagePlural ==
+Deleted in the source of the merge, but also deleted on destination ({0} items)
+
+== DiscardedAddedWarningMessageSingular ==
+Added in the source of the merge, but add already applied on destination (1 item)
+
+== DiscardedAddedWarningMessagePlural ==
+Added in the source of the merge, but add already applied on destination ({0} items)
+
+== DiscardedChangedWarningMessageSingular ==
+Changed in the source of the merge, but destination contents are exactly the same (1 item)
+
+== DiscardedChangedWarningMessagePlural ==
+Changed in the source of the merge, but destination contents are exactly the same ({0} items)
+
+== DiscardedDeleteWarningMessageSingular ==
+Deleted in the source of the merge. Destination tree doesn't have to load this path (1 item)
+
+== DiscardedDeleteWarningMessagePlural ==
+Deleted in the source of the merge. Destination tree doesn't have to load this path ({0} items)
+
+== DiscardedFSProtectionWarningMessageSingular ==
+Filesystem permissions changed in the source of the merge, but same permissions were already applied on the destination (1 item)
+
+== DiscardedFSProtectionWarningMessagePlural ==
+Filesystem permissions changed in the source of the merge, but same permissions were already applied on the destination ({0} items)
+
+== DiscardedMovedWarningMessageSingular ==
+Moved in the source of the merge, but move already applied on the destination (1 item)
+
+== DiscardedMovedWarningMessagePlural ==
+Moved in the source of the merge, but move already applied on the destination ({0} items)
+
+== PathInConflictWarningMessageSingular ==
+These items were renamed because the paths were already in use during the merge operation (1 item)
+
+== PathInConflictWarningMessagePlural ==
+These items were renamed because the paths were already in use during the merge operation ({0} items)
+
+== XlinkWarningMessageSingular ==
+{0} (1 item)
+
+== XlinkWarningMessagePlural ==
+{0} ({{0}} items)
+
+== DivergentMoveConflictsSingular ==
+Divergent move conflicts (1 item)
+
+== DivergentMoveConflictsPlural ==
+Divergent move conflicts ({0} items)
+
+== CyleMoveConflictsSingular ==
+Cycle move conflicts (1 item)
+
+== CyleMoveConflictsPlural ==
+Cycle move conflicts ({0} items)
+
+== EvilTwinsSingular ==
+Evil twin conflicts (1 item)
+
+== EvilTwinsPlural ==
+Evil twin conflicts ({0} items)
+
+== MoveDeleteConflictsSingular ==
+Move/Delete conflicts (1 item)
+
+== MoveDeleteConflictsPlural ==
+Move/Delete conflicts ({0} items)
+
+== DeleteMoveConflictsSingular ==
+Delete/Move conflicts (1 item)
+
+== DeleteMoveConflictsPlural ==
+Delete/Move conflicts ({0} items)
+
+== MovedEvilTwinsSingular ==
+Moved evil twin conflicts (1 item)
+
+== MovedEvilTwinsPlural ==
+Moved evil twin conflicts ({0} items)
+
+== AddMoveConflictsSingular ==
+Add/Move conflicts (1 item)
+
+== AddMoveConflictsPlural ==
+Add/Move conflicts ({0} items)
+
+== MoveAddConflictsSingular ==
+Move/Add conflicts (1 item)
+
+== MoveAddConflictsPlural ==
+Move/Add conflicts ({0} items)
+
+== LoadedTwiceConflictsSingular ==
+Items loaded twice conflicts (1 item)
+
+== LoadedTwiceConflictsPlural ==
+Items loaded twice conflicts ({0} items)
+
+== MoveSourceDeleteConflictsSingular ==
+Move/Delete, move out of delete conflicts (1 item)
+
+== MoveSourceDeleteConflictsPlural ==
+Move/Delete, move out of delete conflicts ({0} items)
+
+== DeleteMoveSourceConflictsSingular ==
+Delete/Move, move out of delete conflicts (1 item)
+
+== DeleteMoveSourceConflictsPlural ==
+Delete/Move, move out of delete conflicts ({0} items)
+
+== ChangeDeleteConflictsSingular ==
+Change/Delete conflicts (1 item)
+
+== ChangeDeleteConflictsPlural ==
+Change/Delete conflicts ({0} items)
+
+== DeleteChangeConflictsSingular ==
+Delete/Change conflicts (1 item)
+
+== DeleteChangeConflictsPlural ==
+Delete/Change conflicts ({0} items)
+
+== ReadonlyXlinkConflictsSingular ==
+Readonly Xlink conflicts (1 item)
+
+== ReadonlyXlinkConflictsPlural ==
+Readonly Xlink conflicts ({0} items)
+
+== ResolveDirectoryConflict ==
+Resolve directory conflict
+
+== ResolveDirectoryConflictChooseOption ==
+In order to resolve the conflict, choose one of the following options:
+
+== SelectAMatch ==
+Please select a change to be matched
+
+== SearchMatchesDialogTitle ==
+Search moved candidates
+
+== SearchMatchesDialogExplanation ==
+All possible sources for the new item are displayed. Slide the bar below to change the similarity threshold.
+
+== MinSimilarityAccepted ==
+Min. accepted similarity: {0:0.0}
+
+== LoadingMatches ==
+Loading matches...
+
+== SrcPathColumn ==
+Source path
+
+== DstPathColumn ==
+Destination path
+
+== SimilarityColumn ==
+Similarity
+
+== MergeCategoryNameSingular ==
+Merged from {0}: 1 item
+
+== MergeCategoryNamePlural ==
+Merged from {0}: {{0}} items
+
+== AddedMergeDiffSingular ==
+Added (files added in the merge source): 1 item
+
+== AddedMergeDiffPlural ==
+Added (files added in the merge source): {0} items
+
+== DeletedMergeDiffSingular ==
+Deleted (files deleted in the merge source): 1 item
+
+== DeletedMergeDiffPlural ==
+Deleted (files deleted in the merge source): {0} items
+
+== MergedMergeDiffSingular ==
+Merged (files changed in the merge source and in the merge destination): 1 item
+
+== MergedMergeDiffPlural ==
+Merged (files changed in the merge source and in the merge destination): {0} items
+
+== MovedMergeDiffSingular ==
+Moved (files moved in the merge source): 1 item
+
+== MovedMergeDiffPlural ==
+Moved (files moved in the merge source): {0} items
+
+== ReplacedMergeDiffSingular ==
+Changed (files changed in the merge source): 1 item
+
+== ReplacedMergeDiffPlural ==
+Changed (files changed in the merge source): {0} items
+
+== AddedDiffSingular ==
+Added: 1 item
+
+== AddedDiffPlural ==
+Added: {0} items
+
+== ChangedDiffSingular ==
+Changed: 1 item
+
+== ChangedDiffPlural ==
+Changed: {0} items
+
+== DeletedDiffSingular ==
+Deleted: 1 item
+
+== DeletedDiffPlural ==
+Deleted: {0} items
+
+== MovedDiffSingular ==
+Moved: 1 item
+
+== MovedDiffPlural ==
+Moved: {0} items
+
+== MergedDiffSingular ==
+Merged: 1 item
+
+== MergedDiffPlural ==
+Merged: {0} items
+
+== FSProtectionDiffSingular ==
+Only filesystem permissions changed: 1 item
+
+== FSProtectionDiffPlural ==
+Only filesystem permissions changed: {0} items
+
+== Source ==
+Source:
+
+== Destination ==
+Destination:
+
+== KeepSrcChanges ==
+Keep source changes
+
+== KeepSrcNotSupported ==
+Keeping the source item is not supported for this type of conflict
+
+== KeepDstChanges ==
+Keep destination changes
+
+== KeepDstNotSupported ==
+Keeping the destination item is not supported for this type of conflict
+
+== RenameOnDst ==
+Rename item in your workspace
+
+== RenameNotSupported ==
+Renaming of destination item is not supported for this type of conflict
+
+== InputItemNameMessage ==
+Please input an item name
+
+== AutomaticMergesUnsolvedCaptionSingular ==
+1 item to merge
+
+== AutomaticMergesUnsolvedCaptionPlural ==
+{0} items to merge
+
+== HelpButton ==
+Help
+
+== AdvancedButton ==
+Advanced
+
+== AdvancedButtonAmp ==
+&Advanced
+
+== BranchExplorerMenuButton ==
+Branch Explorer
+
+== BranchExplorerSearchFieldTooltip ==
+Type a search pattern. Use cs: lb: or br: to restrict results
+
+== BranchExplorerSearchFieldShortcutsTooltip ==
+Keyboard shortcuts:
+  Enter: focus the next search result
+  Ctrl+Enter: focus the previous one
+
+== BranchColumn ==
+Branch
+
+== CancelButton ==
+Cancel
+
+== CancelButtonAmp ==
+&Cancel
+
+== CloseButton ==
+Close
+
+== OkButton ==
+OK
+
+== YesButton ==
+Yes
+
+== NoButton ==
+No
+
+== CheckinButton ==
+Checkin
+
+== CheckinButtonAmp ==
+Check&in
+
+== CheckinToADifferentBranchButton ==
+Checkin changes to a different branch...
+
+== CheckinToADifferentBranch ==
+Checkin changes to a different branch
+
+== MoveChangesetsToADifferentBranch ==
+Move changesets to a different branch
+
+== ShelveButton ==
+Shelve
+
+== ShowShelvesButton ==
+Show shelves
+
+== ShowShelvesViewTooltip ==
+Show the shelves view
+
+== OptionsTooltip ==
+Configure the pending changes options
+
+== ChooseMessage ==
+Choose...
+
+== GluonConfigurationSelectRepositoryButton ==
+Select...
+
+== GluonConfigurationBrowseWorkspacePathButton ==
+Choose Path...
+
+== GluonConfigurationCreateRepositoryButton ==
+Create...
+
+== ChooseMessageAmp ==
+Ch&oose...
+
+== ChooseMessageAmp2 ==
+C&hoose...
+
+== NewMessageAmp ==
+&New...
+
+== ConflictColumn ==
+Conflict
+
+== CheckinMergeTitle ==
+User action required at checkin
+
+== ChangesetColumn ==
+Changeset
+
+== DefaultBranchesQuery ==
+find branch
+
+== DefaultChangesetsQuery ==
+find changeset
+
+== ExecuteButton ==
+Execute
+
+== ExecuteButtonAmp ==
+&Execute
+
+== FileConflictsCaptionSingular ==
+file conflict to solve.
+
+== FileConflictsCaptionPlural ==
+file conflicts to solve.
+
+== FileConflictsCaptionForIncomingViewSingular ==
+file in conflict with your changes.
+
+== FileConflictsCaptionForIncomingViewPlural ==
+files in conflict with your changes.
+
+== FileConflictsUnsolvedCaption ==
+For {0} items, both source and destination contributors have changes. User interaction might be required (manual merge)
+
+== FilterLabel ==
+Filter:
+
+== Controlled ==
+Controlled
+
+== ItemsMenuCheckout ==
+Checkout
+
+== ItemsMenuLockAndCheckout ==
+Lock and checkout
+
+== ItemsMenuCheckoutRecursive ==
+Checkout recursively
+
+== CheckedOut ==
+Checked-out
+
+== Deleted ==
+Deleted
+
+== Changed ==
+Changed on disk
+
+== ContainsChanges ==
+Contains changes
+
+== Private ==
+Private
+
+== Ignored ==
+Ignored
+
+== Ignore ==
+Ignore
+
+== Cloaked ==
+Cloaked
+
+== Cloak ==
+Cloak
+
+== HiddenChanged ==
+Hidden changed
+
+== SwitcherMainWindowTitle ==
+Plastic SCM - Switcher
+
+== MainWindowTitle ==
+Plastic SCM - wk: {0} - {1} - {2}: {3}@{4}
+
+== GluonMainWindowTitle ==
+Gluon - wk: {0} - {1}
+
+== StatusInfo ==
+You are browsing {0} {1}@{2}
+
+== DiffWindowTitle ==
+Comparing previous content with revisions on {0}
+
+== ChangesetsDiffWindowTitle ==
+Comparing revisions on {0} with revisions on {1}
+
+== FsProtectionDifferences ==
+Filesystem permissions changed from {0} to {1}
+
+== NoItemsToUndo ==
+No items are selected. Use the items' checkboxes to select them. This can also occur if you have selected items, but they are all private or ignored.
+
+== ProgressSizeMessage ==
+{0} of {1}
+
+== ResolveConflictsButton ==
+Resolve conflicts
+
+== ApplyChangesButton ==
+Apply changes
+
+== QueryLabel ==
+Query:
+
+== RefreshButton ==
+Refresh
+
+== RefreshButtonAmp ==
+&Refresh
+
+== GoHomeButton ==
+Home
+
+== GoHomeTooltip ==
+Go to working changeset
+
+== OnlyRelevantButton ==
+Only relevant
+
+== OnlyRelevantTooltip ==
+Show only relevant changesets
+
+== ResolutionMethodColumn ==
+Resolution method
+
+== SolvedConflict ==
+Solved conflict
+
+== UndoButton ==
+Undo
+
+== UndoButtonAmp ==
+&Undo
+
+== UndoUnchangedButton ==
+Undo unchanged
+
+== UndoRequest ==
+Confirm undoing changes
+
+== UndoRequestMessageSingular ==
+You are going to undo 1 change. This operation can't be undone. Continue?
+
+== UndoRequestMessagePlural ==
+You are going to undo {0} changes. This operation can't be undone. Continue?
+
+== CheckoutIgnoringFailedRequest ==
+Some files can't be checkedout because they are locked
+
+== CheckoutIgnoringFailedRequestMessage ==
+
+Do you want to skip the locked files and checkout the rest?
+
+The locked files are: {0}
+
+== UndoUnchangedRequestMessage ==
+You are going to undo unchanged items. This operation can't be undone. Continue?
+
+== UndoWithMergeLinkMessageSingular ==
+You are going to undo 1 change and the related merge links. This operation can't be undone. Continue?
+
+== UndoWithMergeLinkMessagePlural ==
+You are going to undo {0} changes and the related merge links. This operation can't be undone. Continue?
+
+== UnsolvedConflict ==
+Unsolved conflict
+
+== PendingChangesOptionsTitle ==
+Pending changes options
+
+== CreatingRepository ==
+Creating repository {0}...
+
+== CreatingWorkspace ==
+Creating workspace {0}...
+
+== WaitingForDynamicWorkspaceToBeMounted ==
+Waiting to mount dynamic workspace {0} ...
+
+== CreatingBranch ==
+Creating branch {0}...
+
+== CreatingLabel ==
+Creating label {0}...
+
+== RepositoryNameAlreadyExists ==
+The repository {0} already exists
+
+== RenamingRepository ==
+Renaming repository...
+
+== RenamingWorkspace ==
+Renaming workspace {0}...
+
+== RenamingBranch ==
+Renaming branch {0}...
+
+== RenamingLabel ==
+Renaming label {0}...
+
+== EditingAttribute ==
+Editing attribute '{0}'...
+
+== ChangingRevisionType ==
+Changing the revision type...
+
+== DeletingWorkspacesSingular ==
+Deleting workspace{0}...
+
+== DeletingWorkspacesPlural ==
+Deleting workspaces{0}...
+
+== DeletingRepositoriesSingular ==
+Deleting repository{0}...
+
+== DeletingRepositoriesPlural ==
+Deleting repositories{0}...
+
+== UndeletingRepositoriesSingular ==
+Undeleting repository{0}...
+
+== UndeletingRepositoriesPlural ==
+Undeleting repositories{0}...
+
+== DeletingBranchesSingular ==
+Deleting branch{0}...
+
+== DeletingBranchesPlural ==
+Deleting branches{0}...
+
+== DeletingLabelsSingular ==
+Deleting label{0}...
+
+== DeletingLabelsPlural ==
+Deleting labels{0}...
+
+== DeletingShelvesSingular ==
+Deleting shelve...
+
+== DeletingShelvesPlural ==
+Deleting shelves...
+
+== DeletingAttributesSingular ==
+Deleting attribute {0}...
+
+== DeletingAttributesPlural ==
+Deleting attributes {0}...
+
+== DeletingChangeset ==
+Deleting changeset...
+
+== MovingChangeset ==
+Moving changeset...
+
+== PreviousLabel ==
+Previous result
+
+== NextLabel ==
+Next result
+
+== BrexSearchFieldLabel ==
+Branch Explorer search
+
+== BrexDisplayOptions ==
+Display options
+
+== DateFilterTitle ==
+Date filter:
+
+== InitialDateLabel ==
+From:
+
+== EndDateLabel ==
+To:
+
+== SinceDateLabel ==
+Since:
+
+== InitialDateMessageError ==
+The initial date {0} of the date filter is invalid
+
+== EndDateMessageError ==
+The end date {0} of the date filter is invalid
+
+== ResetDateFilterButton ==
+Reset to defaults
+
+== ApplyDateFilterButton ==
+Apply filter
+
+== Done ==
+Done.
+
+== SelectAll ==
+Select all
+
+== MergeSelectedFiles ==
+Merge selected files
+
+== MergeKeepingSourceChanges ==
+Merge keeping source changes (theirs)
+
+== MergeKeepingWorkspaceChanges ==
+Merge keeping workspace changes (yours/destination)
+
+== DiffDestinationWithSource ==
+Diff source with destination contributor
+
+== DiffDestinationWithAncestor ==
+Diff ancestor with destination contributor
+
+== DiffSourceWithAncestor ==
+Diff ancestor with source contributor
+
+== DiffSourceWithDestinationEvilTwin ==
+Diff item added in source with item added in destination
+
+== DiffSourceWithDestinationAddMove ==
+Diff item added in source with item moved in destination
+
+== DiffSourceWithDestinationCycleMove ==
+Diff item moved in source with item moved in destination
+
+== DiffSourceWithDestinationDeleteMove ==
+Diff item deleted in source with item moved in destination
+
+== DiffSourceWithDestinationMoveAdd ==
+Diff item moved in source with item added in destination
+
+== DiffSourceWithDestinationMoveDelete ==
+Diff item moved in source with item deleted in destination
+
+== DiffSourceWithDestinationMoveEvilTwin ==
+Diff item moved in source with item moved in destination
+
+== RetryUpdate ==
+Retry update
+
+== UpdateForced ==
+Update forced
+
+== LoadingWorkspaces ==
+Loading workspaces...
+
+== WaitingForDynamicWorkspaces ==
+Mounting dynamic workspaces ...
+
+== LoadingHistory ==
+Loading history...
+
+== LoadingAnnotations ==
+Loading annotations...
+
+== LoadingBrowseRepository ==
+Loading changeset tree...
+
+== ProcessingMerge ==
+Processing merge...
+
+== CalculatingMerge ==
+Calculating merges...
+
+== CalculatingIncomingChanges ==
+Calculating incoming changes...
+
+== LoadingFindMerge ==
+Finding elements to merge...
+
+== LoadingPendingChanges ==
+Finding changes in the workspace...
+
+== LabellingWorkspace ==
+Applying the label {0} to the workspace...
+
+== LabellingChangeset ==
+Applying the label {0} to the changeset {1}...
+
+== ApplyingLocalChanges ==
+Applying local changes...
+
+== ApplyingConflicts ==
+Applying conflicts...
+
+== LoadingRepositories ==
+Loading repositories...
+
+== PendingChangesOptionsExplanation ==
+Select the type of items to display. 
+These following options let you choose how the items are shown in the 'Pending changes' view:
+
+== NewRepositoryExplanation ==
+Type a name for the new repo and ensure you will create it on the correct server.
+
+== NewWorkspaceExplanation ==
+The workspace is the local copy to work on files and make changes. A workspace handles a single branch at a time. The workspace can be switched to a different branch even in a different repository.
+
+== RenameWorkspaceExplanation ==
+Renaming the workspace won’t modify its path.
+
+== PendingChangesOptionsInfo ==
+* This option requires a disk search, so if your workspace is very large, or it has lots of private files, the operation could take awhile.
+
+== AutoRefreshPendingChangesButton ==
+Auto-refresh
+
+== AutoRefreshPendingChangesLabel ==
+Refresh the Checkin Changes view when it gets the focus.
+
+== CheckedOutCheckButton ==
+Show checked-out items
+
+== CheckedOutLabel ==
+Show items that were explicitly checked out for editing by the user.
+
+== ChangedCheckButton ==
+Show changed items *
+
+== ChangedCheckLabel ==
+Show items that were changed on disk, but not checked out in Plastic SCM.
+
+== PrivateCheckButton ==
+Show private items *
+
+== PrivateCheckLabel ==
+Show items that are not under source control, so they are private for the workspace.
+
+== IgnoredCheckButton ==
+Show ignored objects *
+
+== IgnoredCheckLabel ==
+Show those private items that are marked to be ignored.
+
+== ItemSearchMenuTitle ==
+Search menu
+
+== ItemSearchField ==
+Item search
+
+== SearchInProgress ==
+Searching...
+
+== SearchIncludePrivateItems ==
+Include private items
+
+== HiddenChangedCheckButton ==
+Show hidden changed items *
+
+== HiddenChangedCheckLabel ==
+Show those changed items that are marked to be ignored.
+
+== ManuallyDeletedCheckButton ==
+Show manually deleted items *
+
+== ManuallyDeletedCheckLabel ==
+Show items that were deleted on disk out of Plastic SCM control.
+
+== ManuallyMovedCheckButton ==
+Show manually renamed/moved items *
+
+== ManuallyMovedCheckLabel ==
+Show items that were moved or renamed on disk, out of the Plastic SCM control.
+
+== BinSameExtOnlyCheckButton ==
+Match binary files only if they have the same extension
+
+== TxtSameExtOnlyCheckButton ==
+Match text files only if they have the same extension
+
+== LookForNewerChangesCheckButton ==
+Look for newer changes in the repository
+
+== LookForNewerChangesCheckLabel ==
+Show information when there are newer changes in the repository (checks working branch/changeset)
+
+== SizeColumn ==
+Size
+
+== Show ==
+Show
+
+== Hide ==
+Hide
+
+== BinaryFile ==
+Binary
+
+== Directory ==
+Directory
+
+== TextFile ==
+Text
+
+== LinkFile ==
+Symlink
+
+== Unknown ==
+Unknown
+
+== CustomExtensionFile ==
+Custom extension
+
+== CreateChildBranchTitle ==
+Create Branch
+
+== CreateChildBranchExplanation ==
+Create a new child branch from
+
+== ReplicateBranchTitle ==
+Plastic SCM Replication
+
+== ReplicateBranchExplanation ==
+Replicate a branch from/to another repository.
+
+== UsingProfile ==
+Profile: {0}
+
+== DefaultProfile ==
+Using default configuration
+
+== LabelChangesetExplanation ==
+Label changeset {0} of {1}@{2}
+
+== RenameBranchTitle ==
+Rename Branch
+
+== CreateLabelTitle ==
+Apply a label to a changeset
+
+== CreateLabelExplanation ==
+Labels help highlight important changesets. Typically, labels mark stable baselines and releases to customers.
+
+== RenameLabelTitle ==
+Rename Label
+
+== EditAttributeTitle ==
+Edit attribute
+
+== LastChangeset ==
+last changeset
+
+== BranchNameEntry ==
+Branch name:
+
+== BranchNameAlreadyExists ==
+The branch {0} already exists
+
+== LabelNameAlreadyExists ==
+The label {0} already exists ({1})
+
+== LabelNameEntry ==
+Label name:
+
+== AttributeNameEntry ==
+Attribute name:
+
+== ChangesetToLabelEntry ==
+Changeset to label:
+
+== CommentsEntry ==
+Comments:
+
+== SwitchToBranchCheckButton ==
+Switch workspace to this branch
+
+== SwitchToLabelCheckButton ==
+Switch workspace to this label
+
+== SwitchToBranchTitle ==
+Switch to branch
+
+== SwitchToChangesetTitle ==
+Switch to changeset
+
+== SwitchToLabelTitle ==
+Switch to label
+
+== SwitchToExplanation ==
+There are pending changes in your workspace.
+
+ You can continue with the switch operation or cancel the switch and open a Pending Changes view, so that you can checkin (or undo) the pending changes. Then, you can run the "{0}" command again. 
+
+If you continue with the switch operation, your local changes won't be lost, and will still appear as pending changes after the switch operation.
+
+== SwitchToLabelExplanation ==
+There are pending changes in your workspace.
+
+You can continue with the switch operation or cancel the switch and open a Pending Changes view, so that you can checkin (or undo) the pending changes. Then, you can run the "Switch workspace to this label" command again.
+
+If you continue with the switch operation, your local changes won't be lost, and will still appear as pending changes after the switch operation. But, you won't be able to submit these changes, because a label configuration is a read-only configuration. 
+
+To modify a labeled configuration, create a branch, setting the label as the branch base. Then, switch the workspace to that branch and make changes as usual.
+
+== SwitchToConfirmationCheckButton ==
+Don't show this dialog again
+
+== SwitchToConfirmationContinueButton ==
+Continue with the switch
+
+== SwitchToConfirmationCancelViewChangesButton ==
+Cancel and view changes
+
+== SwitchToConfirmation ==
+You are changing your workspace configuration. Continue?
+
+== SwitchToBranchConfirmation ==
+You are changing your workspace configuration to the branch: {0}.
+
+Continue?
+
+== SwitchToLabelConfirmation ==
+Switching your workspace to a label, which loads the labeled revision of each item. All the loaded revisions will be read-only.
+
+To modify a labeled configuration, create a branch, setting the label as the branch base. Then, switch the workspace to that branch and make changes as usual. 
+
+Continue?
+
+== SwitchActionOptionsTitle ==
+Behavior when trying to switch/update the workspace with changed items
+
+== SwitchActionAllowOption ==
+Allow
+
+== SwitchActionWarnOption ==
+Allow, showing a warning
+
+== SwitchActionFailOption ==
+Do not allow, show an error
+
+== UpdateResultsTitle ==
+Update results
+
+== UpdateResultsExplanation ==
+The update operation found some issues. Please review them.
+
+== CheckinConflictsTitle ==
+Checkin conflicts
+
+== CheckinConflictsExplanation ==
+The checkin operation found the following conflicts that can't be checked in. 
+Click "OK" to continue the operation for the items not in conflict.
+ Click "Cancel" to abort the entire operation. 
+
+== CheckinConflictsToMergeTitle ==
+Files need merging
+
+== CheckinConflictsToMergeExplanation ==
+There are newer changes that need merging with yours. 
+Click "Merge" to merge the files now. 
+Otherwise, click "Cancel".
+
+== EditAttributeExplanation ==
+You can give a new name to the attribute and change its comment text.
+
+== ResetQueryButton ==
+Reset query
+
+== ClearHistoryButton ==
+Clear history
+
+== SetAsDefaultQuery ==
+Set as default query
+
+== NewDirectoryTitle ==
+Create a new directory
+
+== NewFileTitle ==
+Create a new empty file
+
+== NewDirectory ==
+New directory
+
+== NewFile ==
+New file
+
+== RenameDirectoryTitle ==
+Rename Directory
+
+== RenameFileTitle ==
+Rename File
+
+== NewSyncTitle ==
+Create a new Sync View
+
+== DependenciesTitle ==
+Undo checkout dependencies
+
+== DependenciesDialogTitle ==
+Pending dependencies
+
+== AddChildBranches ==
+Add child branches
+
+== AddParentBranches ==
+Add parent branches
+
+== AddBranchesSourceOfMerge ==
+Add branches source of merge
+
+== AddBranchesDestinationOfMerge ==
+Add branches destination of merge
+
+== TypeRule ==
+Type a rule here
+
+== TypeDescription ==
+Type a description here
+
+== ConditionalBranchRulesHelp ==
+You can type a query in 'cm find' format but without having to specify 'find branch'.
+Check the 'find guide' for more information.
+Examples:
+  changesets >= '2 months ago'
+  attribute = 'status' and attrvalue='finished'
+
+== ConditionalChangesetRulesHelp ==
+You can type a query in 'cm find' format but without having to specify 'find changeset'.
+Check the 'find guide' for more information.
+Examples:
+  branch = 'main'
+  attribute = 'status' and attrvalue='finished'
+
+== ConditionalLabelRulesHelp ==
+You can type a query in 'cm find' format but without having to specify 'find label'.
+Check the 'find guide' for more information.
+Examples:
+  date >= '2 months ago'
+  attribute = 'status' and attrvalue='finished'
+
+== DependenciesExplanation ==
+Some selected items depend on others that need to be included in the operation as well.
+Click "{0}" to proceed with all dependent items (recommended), or cancel the operation.
+
+== MergeLinkDescriptionColumn ==
+Merge link description
+
+== TaskIdColumn ==
+ID
+
+== TaskTitleColumn ==
+Title
+
+== AssigneeColumn ==
+Assignee
+
+== LocationColumn ==
+Location
+
+== Merge ==
+Merge
+
+== CherryPick ==
+Cherry pick
+
+== IntervalMerge ==
+Interval merge
+
+== SubtractiveMerge ==
+Subtractive merge
+
+== SubtractiveIntervalMerge ==
+Subtractive interval merge
+
+== UnsupportedMergeType ==
+Unsupported merge type
+
+== MergeSourceFormat ==
+{0} at {1}@{2}
+
+== ConfirmDeleteTitle ==
+Confirm delete
+
+== ConfirmApplyLabelTitle ==
+Confirm labeling operation
+
+== ConfirmApplyLabelExplanation ==
+Applying label "{0}" to all revisions currently in your workspace. Continue?
+
+== BranchNameEmpty ==
+Branch name must not be empty
+
+== LabelNameEmpty ==
+Label name must not be empty
+
+== SyncViewNameEmpty ==
+Sync view name must not be empty
+
+== AttributeNameEmpty ==
+Attribute name must not be empty
+
+== LabelButton ==
+Label
+
+== LabelAllXlinksCheckButton ==
+Label all writable xlinked repositories
+
+== RenameButton ==
+Rename
+
+== Rename ==
+Rename
+
+== CreateButton ==
+Create
+
+== SaveButton ==
+Save
+
+== DeleteButton ==
+Delete
+
+== SwitchButton ==
+Switch
+
+== DiffWindowMenuItemDiff ==
+Diff
+
+== ApplyButton ==
+Apply
+
+== MergeButton ==
+Merge
+
+== BrExNewChangesetWillBeCreated ==
+New changeset
+
+== BrexMergeLinkTitle ==
+Merge link {0}
+
+== BrexMergeLinkCaptionBody ==
+Source: {0}{1}Destination: {2}
+
+== BrexMergeLinkPending ==
+, pending
+
+== BrexMergeChangesetInterval ==
+Changeset interval ({0} - {1}]
+
+== BrexMergeCouldNotMerge ==
+[Oops, could not get the interval data!]
+
+== BrexMergeChangesetOnBranch ==
+changeset {0} on branch {1}
+
+== BrexCherryPickLinkType ==
+(Cherry pick)
+
+== BrexIntervalCherryPickLinkType ==
+(Cherry pick from changeset interval)
+
+== BrexIntervalCherryPickSubstractiveLinkType ==
+(Subtractive from changeset interval)
+
+== BrexCherryPickSubstractiveLinkType ==
+(Subtractive)
+
+== BrexProperties ==
+Properties
+
+== BrexAttributes ==
+Attributes
+
+== CredentialsDialogTitle ==
+Connect to server
+
+== CredentialsDialogExplanation ==
+Please enter your credentials to connect to {0}
+
+== UserName ==
+User name:
+
+== Password ==
+Password:
+
+== UndefinedServer ==
+Undefined server
+
+== RememberCredentialsAsProfile ==
+Remember credentials as a connection profile
+
+== CredentialsErrorSavingProfile ==
+Error saving the connection profile: {0}
+
+== BrexObjectNameProperty ==
+Object name:
+
+== BrexCreationDateProperty ==
+Creation date:
+
+== BrexOwnerProperty ==
+Owner:
+
+== BrexReplicationSourceProperty ==
+Replication src:
+
+== BrexGuidProperty ==
+Guid:
+
+== BrexCommentsProperty ==
+Comments:
+
+== BrexDisplayBranches ==
+Display branches
+
+== BrexDisplayFullBranchNames ==
+Display full branch names
+
+== BrexDisplayMergeLinks ==
+Display merge links
+
+== BrexDisplayCrossBranchCsetLinks ==
+Display cross-branch changeset links
+
+== BrexDisplayLabels ==
+Display labels
+
+== BrexDisplayBranchTaskInfo ==
+Display branch task info
+
+== BrexDisplayVerticalLayout ==
+Display vertical layout
+
+== BrexDisplayOnlyRelevantCsets ==
+Display only relevant changesets
+
+== NoReplicationSources ==
+Not replicated
+
+== PlasticSCMConfiguration ==
+Plastic SCM Configuration
+
+== GluonConfiguration ==
+Gluon Configuration
+
+== PlasticSCMConfigurationCloud ==
+Welcome to Cloud Edition!
+
+== PlasticCloudEditionWelcome ==
+Welcome to Plastic SCM Cloud Edition!
+
+== PlasticCloudEditionConfiguration ==
+Plastic Cloud Edition configuration
+
+== EnterServer ==
+Please enter a server name
+
+== EnterServerFormat ==
+Please specify the server name in server:port format. The default port is 8087
+
+== EnterUserName ==
+Please enter a user name
+
+== EnterEmail ==
+Please enter an email or user name
+
+== EnterPassword ==
+Please enter a password
+
+== EnterRepository ==
+Please enter a repository
+
+== EnterCloudRepository ==
+Please enter a Cloud repository name
+
+== EnterLocalRepository ==
+Please enter a local repository name
+
+== EnterWorkspacePath ==
+Please enter a workspace path
+
+== NoValidPath ==
+No valid path
+
+== Connected ==
+Connected OK ({0})
+
+== CredentialsOK ==
+Credentials checked OK
+
+== ConfigureServer ==
+Please enter the Plastic SCM server location. Ask your sysadmin if you don't know its name or IP.
+
+== ConfigureServerScan ==
+You can also try to scan your network to find the server (it will work depending on how the network is configured):
+
+== GluonConfigureServer ==
+You need to specify where the Plastic SCM server is. Ask your sysadmin if you don't know the name or IP of the server.
+
+== UserNameWillBeUsed ==
+The following username will be used:
+
+== ConfigureCredentials ==
+Configure your credentials:
+
+== ConfigureCredentialsCloudEditionLine1 ==
+Please enter the user and password you use to connect to Plastic Cloud (same as plasticscm.com).
+
+== ConfigureCredentialsCloudEditionLine2 ==
+This is also the user name that will identify you each time you checkin, so choose wisely.
+
+== Connecting ==
+Connecting...
+
+== CheckingCredentials ==
+Checking credentials...
+
+== EnterOrganizationWaterMark ==
+Enter your Plastic Cloud organization name
+
+== EnterServerWaterMark ==
+E.g.: myserver.mynetwork.net:8087
+
+== Connect ==
+Connect
+
+== ConnectAmp ==
+&Connect
+
+== Scan ==
+Scan...
+
+== ScanNetwork ==
+Scan network...
+
+== ScanNetworkAmp ==
+&Scan network...
+
+== UserNameWaterMark ==
+username
+
+== PasswordWaterMark ==
+password
+
+== Check ==
+Check
+
+== CheckAmp ==
+Chec&k
+
+== ChooseRepository ==
+Choose a repository:
+
+== ChooseRepositoryCloudEdition ==
+Join an existing project or create a new one
+
+== EnterRepositoryWaterMark ==
+Enter a repository name or choose from the list
+
+== SelectWorkingDirectory ==
+Select your working directory (a.k.a workspace). This is the directory that will contain the files that you will be working with:
+
+== GluonConfigurationWorkspaceLabel ==
+Workspace:
+
+== GluonConfigurationWorkspaceExplanation ==
+Select your working directory (a.k.a workspace). This is the directory that will contain the files that you will be working with.
+
+== WorkspacePath ==
+Workspace path
+
+== ApplyingChanges ==
+Applying changes...
+
+== Apply ==
+Apply
+
+== ApplyAmp ==
+&Apply
+
+== MustBeConnectedToExplore ==
+Check that you can connect first. Click to check credentials.
+
+== MustBeConnectedToCreateRepository ==
+Connect to the server first. Click to check credentials.
+
+== MustBeConnectedToCreateRepositoryCloudEdition ==
+You must be connected to an organization to create repositories. Check your credentials.
+
+== CouldNotFindRepository ==
+Could not find repository {0}
+
+== CouldNotFindWorkingRepositoryOrBranch ==
+Could not find working repository or branch
+
+== UserUnknown ==
+User unknown {0}
+
+== AvailableChangesets ==
+Available Plastic SCM changesets
+
+== SelectChangesetBelow ==
+Please select a changeset from the list below:
+
+== AvailableBranches ==
+Available Plastic SCM branches
+
+== AvailableRepositories ==
+Available Plastic SCM repositories
+
+== SelectBranchesBelow ==
+Please select a branch from the list below:
+
+== SelectRepositoryBelow ==
+Please select a repository from the list below:
+
+== AvailableServers ==
+Available Plastic SCM servers
+
+== NoServersFound ==
+No servers found :-(
+
+== SelectServerBelow ==
+Please select a server from the list below:
+
+== ScanningForServers ==
+Scanning for servers...
+
+== AddressColumn ==
+Address
+
+== PortColumn ==
+Port
+
+== OpsErrorOccured ==
+Oops! An error occurred
+
+== FilterWaterMark ==
+Filter
+
+== WorkspaceNameWaterMark ==
+Workspace name
+
+== WorkspacePathWaterMark ==
+Workspace path
+
+== NewWorkspaceTitle ==
+Create a new workspace to start working with Plastic SCM
+
+== Actions ==
+Actions
+
+== ExploreWorkspace ==
+Explore workspace
+
+== CheckinChanges ==
+Checkin changes
+
+== Configure ==
+Configure
+
+== ConfigureAmp ==
+&Configure
+
+== Loading ==
+Loading...
+
+== CantPerformOperation ==
+Can't perform the operation
+
+== OperationRunning ==
+Operation running
+
+== OperationInProgress ==
+There is one operation currently running. Please wait until it is finished.
+
+== ConfirmClosingRunningOperation ==
+An operation is currently running. Are you sure you want to quit?
+
+== FileNotFoundTitle ==
+The specified file was not found
+
+== FileNotFound ==
+Could not find {0}
+
+== SearchFiles ==
+Search files...
+
+== SearchFilesAmp ==
+&Search files...
+
+== SearchFilesTooltip ==
+Ctrl+F
+
+== SearchFilesHint ==
+You can use '*' and '?' to match file names. You can also use directories in your search.
+
+== SearchForFiles ==
+Search for files
+
+== EnterFileName ==
+Enter file name
+
+== Searching ==
+Searching
+
+== IncludePrivateFiles ==
+Include private files
+
+== IncludePrivateFilesAmp ==
+Include &private files
+
+== NoMatchesFound ==
+No matches found
+
+== MatchesCountSingular ==
+1 match
+
+== MatchesCountPlural ==
+{0} matches
+
+== ContainerFolderColumn ==
+Container folder
+
+== CheckinComment ==
+Enter your checkin comment here
+
+== BrowseForFolderTitle ==
+Browse for folder
+
+== BrowseForSaveFileTitle ==
+Save file
+
+== NoValidWorkspace ==
+You didn't specify a valid workspace path {0}
+
+== FillFieldsConfiguration ==
+Please fill the following fields to configure Plastic SCM
+
+== FillFieldsConfigurationCloudEdition1 ==
+Please enter the username and password you use to connect to Plastic Cloud (same as plasticscm.com).
+
+== FillFieldsConfigurationCloudEdition2 ==
+This way you won't be prompted again when replicating to cloud.
+
+== PlasticSCMServerLabel ==
+Enter the name/IP and port of your server:
+
+== GluonServerLabel ==
+Server:
+
+== CloudCredentialsLabel ==
+This is also the username that will identify you each time you checkin, so choose wisely.
+
+== CredentialsLabel ==
+Configure your credentials:
+
+== WorkspacePathConfigurationLabel ==
+Workspace path:
+
+== PreferencesWindowTitle ==
+Plastic SCM Preferences - {0}
+
+== GeneralPreferences ==
+General
+
+== DiffAndMerge ==
+Diff and merge
+
+== DiffAndMergeExplanation ==
+Preferences for the Plastic SCM built-in diff and merge tool (Xmerge):
+
+== ComparisonMethodAndEncodingTitle ==
+Comparison method and encoding
+
+== MergeViewBehaviorTitle ==
+Merge view behavior
+
+== ConflictResolutionTitle ==
+Merge conflict resolution
+
+== ComparisonMethod ==
+Comparison method:
+
+== ManualConflictResolution ==
+Manual conflict resolution
+
+== ManualConflictResolutionTooltip ==
+Always launch the merge tool to review conflicts, even if all of them are automatic conflicts
+
+== AutomaticConflictResolution ==
+Automatic conflict resolution (if possible)
+
+== AutomaticConflictResolutionTooltip ==
+Launch the merge tool only when user interaction is required to resolve a conflict
+
+== MergeWithPendingChanges ==
+Allow merge with pending changes
+(disabled by default so new users don't have problems undoing merges)
+
+== OtherOptions ==
+Other options
+
+== UserProfileOptions ==
+User profile
+
+== MiscOptionsTitle ==
+Miscellaneous
+
+== SetFilesAsReadOnlyAfterUpdateOrCi ==
+Update and Checkin operations set files as read-only
+
+== CompareChangedFilesContents ==
+Check content (hash) when the file timestamp is modified
+to set it as "Changed"
+
+== CompareChangedFilesContentsTooltip ==
+This is used to established the "Changed" item status
+
+== UpdateSetsTimestamps ==
+Update operation sets repository timestamps on files
+
+== EnableSharedWorkspaces ==
+Enable shared workspaces support (Samba/WinShare)
+
+== DisplayErrorOnSameCaseFiles ==
+Display error for same file name with different case
+
+== DisplayErrorOnSameCaseFilesTooltip ==
+Applies only to Unix-like filesystems
+
+== DefaultWorkspaceRoot ==
+Default Workspace root:
+
+== CommandHelpDialogTitle ==
+Command help
+
+== MergeToolsConfiguration ==
+Merge tools
+
+== DiffToolsConfiguration ==
+Diff tools
+
+== DiffToolsTableTitle ==
+Configure a diff tool for different file types and extensions. The rules are applied in the order below, top to bottom.
+
+== DiffToolsExplanation ==
+Select a file type or extension and enter the command to run the diff tool:
+
+== DiffToolsCommandHelp ==
+You can use the following command-line parameters when invoking the external diff tool.
+            You must ensure that the specified files have the actual revision contents to be compared.
+    
+            @sourcefile: Full path of file whose contents will be displayed in the panel on the left.
+            @destinationfile: Full path of file whose contents will be displayed in the panel on the right.
+
+            @sourcesymbolic: Symbolic name for the source file.
+            @destinationsymbolic: Symbolic name for the destination file.
+
+            @sourcehash: MD5 string calculated from the source file contents.
+            @destinationhash: MD5 string calculated from the destination file contents.
+
+            @filetype: MIME type, used for syntax highlighting.
+            @comparationmethod: Comparison method used.
+            @fileencoding: Default file encoding to use when no encoding is detected.
+
+== MergeToolsTableTitle ==
+Configure a merge tool for different file types and extensions. The rules are applied in the order below, top to bottom.
+
+== MergeToolsExplanation ==
+Select a file type or extension and enter the command to run the merge tool:
+
+== MergeToolsCommandHelp ==
+The following variables are available to use as arguments when invoking the external merge tool in the command line:
+  
+            @sourcefile: Full path of the source merge file.  
+            @destinationfile: Path of the destination merge file.
+            @basefile: Path of the common ancestor merge file.
+            @output: Path of the merge result file.
+
+            @sourcesymbolic: Symbolic name for the source file.
+            @destinationsymbolic: Symbolic name for the destination file.
+            @basesymbolic: Symbolic name for the base file.
+
+            @sourcehash: MD5 string calculated from the source file contents.
+            @destinationhash: MD5 string calculated from the destination file contents.
+            @basehash: MD5 string calculated from base file contents.
+
+            @filetype: MIME type used for syntax highlight.
+            @fileencoding: Default file encoding to use when no encoding is detected.
+            @resultencoding: Result file encoding (if NONE selected, it will be calculated from contributors).
+
+            @comparationmethod: Comparison method used.
+            @mergetype: Type of merge used.
+
+            @progress: A progress string indicating the current operation, e.g. 'Merging file 3/10'.
+            @extrainfofile: Path of a file which contains extra information about the current merge.
+
+== TypeSuffixColumn ==
+Type/Suffix
+
+== DiffCommandColumn ==
+Diff tool command line
+
+== MergeCommandColumn ==
+Merge tool command line
+
+== AddToolButton ==
+Add
+
+== RemoveToolButton ==
+Remove
+
+== FileTypeQuestion ==
+Which files should this command match?
+
+== ExtensionTooltip ==
+.extension
+
+== ExternalTool ==
+External tool:
+
+== ExternalToolNotFoundError ==
+Tool not found, please introduce a valid one
+
+== BrowseForExecutableFile ==
+Browse for executable file
+
+== CommandTooltip ==
+Type your command here
+
+== SavingConfiguration ==
+Saving configuration...
+
+== FileCorruptError ==
+The file {0} contains errors and its configuration cannot be used. Please review its contents. Error: {1}
+
+== UndoCheckoutTitle ==
+Undo checkout
+
+== UndoCheckoutQuestion ==
+Undoing the checkout of the selected items will discard any changes made to them since the last checkin. This operation can't be undone. Continue?
+
+== RenameSyncTitle ==
+Rename Sync View
+
+== RenameTitle ==
+Rename item
+
+== RenameExplanation ==
+Enter a new name for the element to be renamed
+
+== NewFileExplanation ==
+Enter a name for the new empty file to be created
+
+== NewDirectoryExplanation ==
+Enter a name for the new directory to be created
+
+== EnterValidFileName ==
+Please enter a valid file name
+
+== ConfirmActionToPerform ==
+Please confirm the action to perform
+
+== DeleteItemsOnDisk ==
+Delete items on disk
+
+== DoNotDeleteItemsOnDisk ==
+Do not delete items on disk
+
+== ExpandDetails ==
+< Details
+
+== ExpandDetailsAmp ==
+< &Details
+
+== CollapseDetails ==
+Details >
+
+== CollapseDetailsAmp ==
+&Details >
+
+== ToggleDetailsPanel ==
+Toggle details panel (F7)
+
+== ApplyLocalChange ==
+Apply local change
+
+== ApplyLocalChanges ==
+Apply local changes
+
+== UndoChange ==
+Undo change
+
+== SearchingDependencies ==
+Searching dependencies...
+
+== ApplyingDependencies ==
+Applying dependencies...
+
+== DependenciesExplanationHeader ==
+There are selected items with dependencies that need to be also included in the operation.
+
+== DependenciesExplanationText ==
+Some selected items depend on others that need to be included in the operation as well. Click "OK" to proceed with all dependent items (recommended), or cancel the operation and go back to the pending changes list to deselect the items with dependencies.
+
+
+== CheckinViewOptions ==
+Checkin view options
+
+== CheckinViewOptionsExplanation ==
+The following options let you choose which items are shown in the checkin view:
+
+== SearchForChangesOnDisk ==
+Search for changes on disk *
+
+== Canceling ==
+Canceling...
+
+== CancelingMerge ==
+Canceling... (wait until current merge operation finishes)
+
+== KeepLocked ==
+Keep items locked
+
+== GettingSelectedObjects ==
+Getting selected objects...
+
+== KeepLockedAmp ==
+&Keep items locked
+
+== StatusCannotMerge ==
+Cannot merge
+
+== StatusOutOfDate ==
+Out of date
+
+== StatusDeletedOnServer ==
+Deleted on server
+
+== StatusLocked ==
+Locked by '{0}'
+
+== StatusCheckedOutChanged ==
+Checked-out (changed)
+
+== StatusCheckedOutUnchanged ==
+Checked-out (unchanged)
+
+== StatusChanged ==
+Changed
+
+== StatusReplaced ==
+Replaced
+
+== StatusNotOnDisk ==
+Not on disk
+
+== StatusAdded ==
+Added
+
+== StatusIgnored ==
+Ignored
+
+== UpdatingWorkspace ==
+Updating your workspace...
+
+== ApplyingConfiguration ==
+Applying configuration...
+
+== SwitchingToBranch ==
+Switching to branch {0}...
+
+== SwitchingToChangeset ==
+Switching to changeset {0}...
+
+== SwitchingToLabel ==
+Switching to label {0}...
+
+== StatusUnchanged ==
+Unchanged
+
+== StatusUnderUnresolvedXlink ==
+The xlinked cset '{0}@{1}' is not available
+
+== ConfigurationMode ==
+Configuration Mode
+
+== MovedHistoryDescription ==
+Moved from {0} to "{1}"
+
+== RemovedHistoryDescription ==
+Removed {0}
+
+== SelectProgramToLaunch ==
+Select a program to launch
+
+== SwitchWorkspace ==
+Switch workspace...
+
+== ToogleModeRequest ==
+Pending changes to apply
+
+== ToogleModeRequestMessage ==
+Your changes in Configuration Mode will be lost if you don't click Apply before switching to the Explorer mode.
+
+== WindowTitle ==
+Workspace: {0}
+
+== ItemsMenuUpdate ==
+Update
+
+== XlinkExpansionRules ==
+Branch expansion rules:
+
+== ConfigurationUnresolvedXlink ==
+The xlinked cset '{0}@{1}' is not available
+
+== WorkspacesViewTitle ==
+Workspaces
+
+== RepositoriesViewTitle ==
+Repositories
+
+== ItemsViewTitle ==
+Explorer
+
+== PendingChangesViewTitle ==
+Pending Changes
+
+== BranchExplorerViewTitle ==
+Branch Explorer
+
+== BranchExplorerMergeExplanationTitle ==
+Merge explanation for repository {0}
+
+== BranchesViewTitle ==
+Branches
+
+== ChangesetsViewTitle ==
+Changesets
+
+== LabelsViewTitle ==
+Labels
+
+== SyncViewTitle ==
+Sync Repositories
+
+== SyncViewTitleCloudEdition ==
+Sync to Cloud
+
+== ShelvesViewTitle ==
+Shelves
+
+== HistoryViewTitle ==
+History of {0}
+
+== AnnotateViewTitle ==
+Annotate of {0}
+
+== BrowseRepositoryViewTitle ==
+Browse repository - {0}
+
+== MergeViewTitle ==
+Merge
+
+== GameUIUsageTitle ==
+GameUI usage
+
+== ConfigurationModeExplanationAutomatic ==
+Directory update mode: Automatic
+
+Automatic mode is set when all the children of a directory are selected.
+Automatic means that all new files and directories will be downloaded during the update.
+
+== ConfigurationModeExplanationManual ==
+Directory update mode: Manual
+
+Manual mode is set when not all the children of a directory are selected.
+Manual means new files and directories won’t be automatically downloaded by the update.
+
+== GameUIUsageMessage ==
+
+                Usage: gameui [<options>]
+
+                options: [--configure] [--switch]
+                         [<wkOption>] [<clientconfOption>]
+                         [<serverOption>] [<cacheserverOption>]
+
+                --configure:            Shows the configuration window.
+                --switch:               Forces the workspace switcher to be displayed.
+
+                wkOption:               {--wk}=<path to target workspace>
+                clientconfOption:       {--clientconf}=<path to the client configuration file>
+                serverOption:           {--server}=<server spec>
+                cacheserverOption:      {--cacheserver}=<proxy server spec>
+
+== AskUpgradeText ==
+The Plastic SCM server you are connecting to is not compatible with your client.
+
+            In order to connect to this server, you need to upgrade your client installation.
+
+            Do you want to start the upgrade now?
+
+== AskUpgradeCaption ==
+Newer version available
+
+== PendingDirectoryConflictsResolvingConflictsSingular ==
+There is 1 directory conflict that must be resolved before resolving file conflicts.
+
+== PendingDirectoryConflictsResolvingConflictsPlural ==
+There are {0} directory conflicts that must be resolved before resolving file conflicts.
+
+== PendingDirectoryConflictsApplyingChangesSingular ==
+There is 1 directory conflict that must be resolved before applying changes.
+
+== PendingDirectoryConflictsApplyingChangesPlural ==
+There are {0} directory conflicts that must be resolved before applying changes.
+
+== PendingDirectoryConflictsUpdatingWorkspaceSingular ==
+There is 1 directory conflict that must be resolved before updating the workspace.
+
+== PendingDirectoryConflictsUpdatingWorkspacePlural ==
+There are {0} directory conflicts that must be resolved before updating the workspace.
+
+== CreatedByColumn ==
+Created by
+
+== UnresolvedXlink ==
+unresolved xlink
+
+== CouldNotLoadHistory ==
+The history cannot be loaded.
+
+== UnexpectedError ==
+An unexpected error has occurred.
+
+== SaveRequest ==
+Confirm saving comments
+
+== SaveRequestMessage ==
+The comment of the current selected object was modified. Save the changes?
+
+== ProvideDifferentWorkspaceName ==
+Please provide a different workspace name or cancel the operation.
+
+== ProvideDifferentRepositoryName ==
+Please provide a different repository name or cancel the operation.
+
+== ProvideDifferentItemName ==
+Please provide a different item name or cancel the operation.
+
+== ProvideDifferentBranchName ==
+Please provide a different branch name or cancel the operation.
+
+== ProvideDifferentLabelName ==
+Please provide a different label name or cancel the operation.
+
+== ProvideDifferentSyncViewName ==
+Please provide a different sync view name or cancel the operation.
+
+== ProvideDifferentItemNameForRenameResolution ==
+Please provide a different item name.
+
+== ProvideUserName ==
+Please input an user name.
+
+== ProvidePassword ==
+Please input a password.
+
+== ReplicationSource ==
+Replication source
+
+== ReplicationDestination ==
+Replication destination
+
+== PullingProgressTitle ==
+Pulling branch {0}
+
+== PushingProgressTitle ==
+Pushing branch {0} to {1}
+
+== CurrentOfTotalReplicationProgressTitle ==
+   {0} of {1}
+
+== PullBranch ==
+Pull branch {0}
+
+== PullRemoteBranch ==
+Pull remote branch
+
+== PushBranch ==
+Push branch {0}
+
+== ReplicateButton ==
+Replicate
+
+== GenericChooseButton ==
+...
+
+== ServerEmpty ==
+The server field cannot be empty.
+
+== RepositoryEmpty ==
+The repository field cannot be empty.
+
+== BranchEmpty ==
+The branch field cannot be empty.
+
+== OperationStarting ==
+Operation starting
+
+== FetchingMetadata ==
+Fetching metadata
+
+== PushingMetadata ==
+Pushing metadata
+
+== IntroducingData ==
+Introducing data
+
+== OperationStartingFetch ==
+Operation starting fetch
+
+== CalculatingInitialChangeset ==
+Calculating initial changeset
+
+== FetchingRevisions ==
+Fetching revisions ({0})
+
+== FetchingBranches ==
+Fetching branches ({0})
+
+== FetchingItems ==
+Fetching items ({0})
+
+== FetchingLabels ==
+Fetching labels ({0})
+
+== FetchingLinks ==
+Fetching links ({0})
+
+== FetchingChildren ==
+Fetching children ({0})
+
+== FetchingChangeSets ==
+Fetching changesets ({0})
+
+== FetchingMoveRealizations ==
+Fetching move realizations ({0})
+
+== FetchingReviews ==
+Fetching reviews ({0})
+
+== FetchingAttributes ==
+Fetching attributes ({0})
+
+== FetchingACLs ==
+Fetching ACLs ({0})
+
+== FetchingReferences ==
+Fetching references ({0})
+
+== FetchingSEIDs ==
+Fetching SEIDs ({0})
+
+== FetchingFinished ==
+Sending metadata ({0})
+
+== OperationStartingPush ==
+Operation starting push
+
+== ReconcilingObjects ==
+Reconciling objects ({0})
+
+== PushingReferences ==
+Pushing references ({0} %)
+
+== ReconcilingACLs ==
+Reconciling ACLs ({0} %)
+
+== PushingBranches ==
+Pushing branches ({0} %)
+
+== PushingItems ==
+Pushing items ({0} %)
+
+== PushingLinks ==
+Pushing links ({0} %)
+
+== PushingLabels ==
+Pushing labels ({0} %)
+
+== PushingAttributes ==
+Pushing attributes ({0} %)
+
+== ProcessingBranches ==
+Processing branches ({0} %)
+
+== PushingChangeSets ==
+Pushing changesets ({0} %)
+
+== PushingRevisions ==
+Pushing revisions ({0} %)
+
+== PushingMoveRealizations ==
+Pushing move realizations ({0} %)
+
+== PushingTrees ==
+Pushing trees ({0} %)
+
+== PushingACLs ==
+Pushing ACLs ({0} %)
+
+== PushingFinished ==
+Pushing finished
+
+== IntroducingDataProgress ==
+Introducing data ({0} %)
+
+== DataWritten ==
+Data written
+
+== OperationAbandoned ==
+Operation abandoned
+
+== OperationFinished ==
+Operation finished
+
+== ReplicationError ==
+An error occurred during the replication: {0}
+
+== UnknownStatus ==
+Unknown status
+
+== RetryReplicaButton ==
+Retry
+
+== SkipReplicaButton ==
+Skip
+
+== SourceReplicationServer ==
+Source server
+
+== SourceReplicationRepository ==
+Source repository
+
+== SourceReplicationBranch ==
+Source branch
+
+== DestinationReplicationServer ==
+Destination server
+
+== DestinationReplicationRepository ==
+Destination repository
+
+== CreateWorkspaceButton ==
+Create a new workspace...
+
+== MenuAddToIgnoreList ==
+Add to ignored list
+
+== MenuRemoveFromIgnoreList ==
+Remove from ignored list
+
+== MenuAddToCloakedList ==
+Add to cloaked list
+
+== MenuRemoveFromCloakedList ==
+Remove from cloaked list
+
+== MenuAddToHiddenChangesList ==
+Add to hidden changes list
+
+== MenuRemoveFromHiddenChangesList ==
+Remove from hidden changes list
+
+== UsingItemExtension ==
+Using the item extension
+
+== UsingItemFullPath ==
+Using the item full path
+
+== UsingItemName ==
+Using the item name
+
+== FilterRulesConfirmationTitle ==
+Filter rules confirmation
+
+== FilterRulesConfirmationAddMessage ==
+The following rules will be added to the configuration file. Continue?
+
+== FilterRulesConfirmationRemoveMessage ==
+The following rules will be removed from the configuration file. Continue?
+
+== FilterRulesConfirmationMessage ==
+The following rules will be added or removed from the configuration file. Continue?
+
+== ApplyRulesToAllWorkspaceCheckButton ==
+Apply rules to all workspaces
+
+== ShelveWithPendingMergeLinksRequest ==
+Shelve with pending merge links
+
+== ShelveWithPendingMergeLinksRequestMessage ==
+You have pending merge links in the workspace. The shelve operation doesn't shelve pending merge links. Do you want to shelve anyway?
+
+== UndoChangesAfterShelveRequest ==
+Undo changes after shelve
+
+== UndoChangesAfterShelveRequestMessage ==
+Your changes have been checked into a temporary changeset (shelve). These changes can be applied now to any branch. Do you want to undo these changes in the workspace?
+
+== ShelveCreatedMessage ==
+Your pending changes have been shelved to: {0}
+
+== NewCertificateTitle ==
+Server SSL certificate is not in the store
+
+== NewCertificateMessage ==
+The server you are connecting to has sent a certificate which is not in the store. This is normal if it is the first time connecting to this server. 
+
+            Certificate details:
+            - Issued to: {0}
+            - Issued by: {1}
+            - Expiration date: {3}
+            - Certificate hash: {5}
+
+            If you trust this host, click "Yes" to add the key to the Plastic SCM key store (recommended if it is the first time connecting to this server). 
+            If you want to carry on connecting just once, without adding the key to the store, click "No". 
+            If you do not trust this host, click "Cancel" to abandon the connection.
+
+== ExistingCertificateChangedTitle ==
+Server certificate has changed!
+
+== ExistingCertificateChangedMessage ==
+WARNING: This host certificate does NOT match the one you have in the key store. It may mean that the server identity has been compromised or a man-in-the-middle attack is being performed on you. 
+
+            Certificate details:
+            - Issued to: {0}
+            - Issued by: {1}
+            - Expiration date: {3}
+            - Certificate hash: {5}
+
+            If you were expecting this change and trust the new certificate, click "Yes" to add the key to the Plastic SCM key store and trust this certificate in the future. 
+            If you want to carry on connecting just once, without adding the key to the store, click "No". 
+            If you want to abandon this connection, click "Cancel". This is the ONLY guaranteed safe choice.
+
+== InvalidCertificateHostnameTitle ==
+Hostname mismatch in secure connection
+
+== InvalidCertificateHostnameMessage ==
+WARNING: The hostname provided in the server certificate does NOT match the server hostname. This means that the certificate was not issued to this hostname or that there is a network configuration problem with this host. 
+
+            - Certificate hostname: {0}
+            - Server hostname: {1}
+
+            If you want to continue connecting to this host, click "Yes". The certificate validation will continue (not recommended). 
+            If you want to abandon the connection, click "No" (recommended).
+
+== PreviousContent ==
+previous content
+
+== RevisionsOnChangeset ==
+revisions in cs:{0}
+
+== RepositoryExplorerServerLabel ==
+Server:
+
+== UndeleteButton ==
+Undelete
+
+== UndeleteButtonTooltip ==
+Use it to recover deleted files
+
+== UndeleteViewTitle ==
+Deleted items
+
+== UndeleteMenuItemUndeleteRevision ==
+Undelete revision
+
+== UndeleteMenuItemUndeleteRevisionToThisPath ==
+Undelete revision to this path...
+
+== UndeletingItem ==
+Undeleting item...
+
+== UndeletingItemsSingular ==
+Undeleting 1 item...
+
+== UndeletingItemsPlural ==
+Undeleting {0} items...
+
+== EnterRestorePathFormTitle ==
+Undelete item
+
+== EnterRestorePathFormParentDoesNotExistExplanation ==
+The parent directory of the item does not exist, please enter a new location
+
+== EnterRestorePathFormIsPathAlreadyUsedExplanation ==
+There is already an item in the same path, please enter a new location
+
+== EnterRestorePathFormTextBoxExplanation ==
+Enter the restore path for the element to be undeleted
+
+== EnterRestorePathFormLabel ==
+Path:
+
+== EnterValidRestorePath ==
+Please enter a valid workspace path
+
+== RestorePathShouldNotExist ==
+The restore path should not exist
+
+== RestorePathParentShouldExist ==
+The parent directory of the restore path should exist
+
+== DeletedItemsOwner ==
+Owner:
+
+== DeletedItemsSince ==
+Since:
+
+== MeOwnerOption ==
+me
+
+== EveryoneOwnerOption ==
+everyone
+
+== UndeleteFindButton ==
+Find
+
+== UndeleteToPathButton ==
+Undelete...
+
+== ItemUndeletedCorrectly ==
+Undeleted ok: '{0}'
+
+== ItemCannotBeUndeleted ==
+Item '{0}' (ID: {1}) could not be undeleted because it was not found in its parent directory revision (ID: {2})
+
+== CheckinViewTitle ==
+Checkin changes
+
+== UserDefinedSyncView ==
+User defined sync view:
+
+== AddSyncViewButton ==
+Add
+
+== RenameSyncViewButton ==
+Rename
+
+== DeleteSyncViewButton ==
+Delete
+
+== SyncViewDetailsTitle ==
+Sync view details
+
+== AddSrcSyncViewRepoButton ==
+Add src repo
+
+== DeleteSrcSyncViewRepoButton ==
+Delete src repo
+
+== AddDstSyncViewRepoButton ==
+Add dst repo
+
+== DeleteDstSyncViewRepoButton ==
+Delete dst repo
+
+== PushVisibleButton ==
+Push visible
+
+== PushVisibleButtonTooltip ==
+Push all visible outgoing branches
+
+== PullVisibleButton ==
+Pull visible
+
+== PullVisibleButtonTooltip ==
+Pull all visible incoming branches
+
+== ShowExcludedBranchesCheckButton ==
+Show excluded branches
+
+== NewSyncView ==
+New sync view
+
+== NewSyncViewName ==
+Sync view name
+
+== NewSyncViewTitle ==
+Create a new Sync View to push/pull groups of branches
+
+== NewSyncViewTitleCloud ==
+Create a new Sync View to push/pull groups of branches to Plastic Cloud
+
+== NewSyncViewExplanation ==
+Instead of pushing/pulling one by one, with Sync Views you can easily replicate branches in batches
+
+== NewSyncViewCheckingRepositories ==
+Checking repositories...
+
+== NewSyncViewNoSourceRepository ==
+There is no {0} repository to use as source
+
+== NewSyncViewNoDestinationRepository ==
+There is no {0} repository to use as destination
+
+== NewSyncViewSourceRepository ==
+Source repository
+
+== NewSyncViewDestinationRepository ==
+Destination repository
+
+== NewSyncViewEnterSyncViewName ==
+Please enter a sync view name
+
+== NewSyncViewEnterRepositorySpec ==
+Please enter a repository spec
+
+== NewSyncViewInvalidRepositorySpec ==
+Invalid repository spec: {0}
+
+== NewSyncViewCheckingSourceRepositoryExists ==
+Checking source repository exists...
+
+== NewSyncViewCheckingDestinationRepositoryExists ==
+Checking destination repository exists...
+
+== NewSyncViewSourceRepositoryNotExist ==
+Source repository {0} does not exist
+
+== NewSyncViewDestinationRepositoryNotExist ==
+Destination repository {0} does not exist
+
+== NewSyncViewCreateSyncView ==
+Create new sync view (push/pull)
+
+== NewSyncViewCreatingRepository ==
+Creating repository...
+
+== SyncStatusLoading ==
+Loading...
+
+== SyncStatusUpToDate ==
+All branches are up to date
+
+== SyncStatusError ==
+Error: {0}
+
+== OutgoingBranchesSingular ==
+Outgoing branches - 1 branch
+
+== OutgoingBranchesPlural ==
+Outgoing branches - {0} branches
+
+== IncomingBranchesSingular ==
+Incoming branches - 1 branch
+
+== IncomingBranchesPlural ==
+Incoming branches - {0} branches
+
+== ExcludedBranchesSingular ==
+Excluded branches - 1 branch
+
+== ExcludedBranchesPlural ==
+Excluded branches - {0} branches
+
+== SyncMenuItemSyncAllMenuItem ==
+Synchronize all
+
+== SyncMenuItemPushAllMenuItem ==
+Push all outgoing branches
+
+== SyncMenuItemPullAllMenuItem ==
+Pull all incoming branches
+
+== SyncMenuItemRefreshReplicationTarget ==
+Refresh
+
+== SyncMenuItemPushBranch ==
+Push branch
+
+== SyncMenuItemPullBranch ==
+Pull branch
+
+== SyncMenuItemExcludeBranch ==
+Exclude branches
+
+== SyncMenuItemIncludeBranch ==
+Include branches
+
+== CantShowBinaryContent ==
+This file is detected as binary. Can't show file content; the file metadata is displayed instead. You can right click it and use "Open" to see its content. Check the online doc for more info.
+
+== CantShowBinaryDiff ==
+This file is detected as binary. No diffs are calculated; the file metadata is displayed instead. You can right click it and use "Diff" to launch an external diff viewer (must be configured). Check the online doc for more info.
+
+== Content ==
+Content of {0}
+
+== NoContent ==
+No content/differences available.
+
+== UpdateMergeExplanation ==
+New changesets were detected in the repository; you can update to/merge from the latest changeset.
+
+== ViewNewChangesButton ==
+View new changes
+
+== RetrievingBranchHeads ==
+Retrieving branch heads...
+
+== RetrievingNewChanges ==
+Retrieving new changes...
+
+== CouldNotLoadNewChanges ==
+Unable to load new changes.
+
+== RetrievingObjectInfo ==
+Retrieving object info...
+
+== WorkspaceRevisionKey ==
+Workspace Revision
+
+== MergeToDiffWithDst ==
+Revision on destination branch
+
+== EncryptionConfiguration ==
+Server encryption
+
+== RetypePassword ==
+Retype Password:
+
+== EncryptionConfigurationExplanation ==
+The server '{0}' requires data encryption.
+            Your client is not yet configured to handle encrypted data from '{0}'.
+
+== EncryptionConfigurationEnterPassword ==
+Enter a password to generate the encryption key:
+
+== EncryptionConfigurationRemarks ==
+Remarks:
+            * Be very careful with the encryption password; it's the only way to decrypt your data on server '{0}'.
+            * If you're decrypting data and you enter a wrong password, the data will fail to decrypt and you will have to edit cryptedservers.conf on your client to fix it.
+            * Be careful to use the same password (encryption key) company-wide to work with '{0}'. Otherwise, data will be encrypted differently in each client.
+
+== InvalidEmptyPassword ==
+Password cannot be empty
+
+== PasswordDoesntMatch ==
+Passwords don't match
+
+== ApplyActionForNextConflictsCheckButtonSingular ==
+Apply this action for the next 1 conflict.
+
+== ApplyActionForNextConflictsCheckButtonPlural ==
+Apply this action for the next {0} conflicts.
+
+== SourceHeaderButton ==
+Select Source: '{0}'
+
+== BaseHeaderButton ==
+Select Base: '{0}'
+
+== DestinationHeaderButton ==
+Select Destination: '{0}'
+
+== SourceHeaderButtonTooltip ==
+(Ctrl+1)
+
+== BaseHeaderButtonTooltip ==
+(Ctrl+2)
+
+== DestinationHeaderButtonTooltip ==
+(Ctrl+3)
+
+== PendingUnsolvedConflicts ==
+The file still has {0} unsolved conflicts.
+
+== FileChangedSinceSaved ==
+The file was changed since it was last saved.
+
+== SaveAndExitButton ==
+save & exit
+
+== ExitWithoutSavingButton ==
+exit without saving
+
+== AutomaticConflictMarkup ==
+Current conflict is <span foreground='green'>automatic</span>. No user intervention is required.
+
+== NonAutomaticConflictMarkup ==
+Current conflict is <span foreground='red'>non-automatic</span>. Resolve it by clicking the buttons above, editing the result file or marking it as resolved.
+
+== NonAutomaticConflictMarkedAsResolvedMarkup ==
+Current conflict is <span foreground='green'>non-automatic</span>, and it has been already <span foreground='green'>resolved</span> by the user.
+
+== MarkAsResolvedButton ==
+Mark as resolved
+
+== MarkAsUnResolvedButton ==
+Mark as unresolved
+
+== GtkMergetoolUsageTitle ==
+Mergetool usage
+
+== GtkMergetoolUsage ==
+
+                Usage: gtkmergetool <mergeoptions>
+
+                mergeOptions: <sourceFile> [<sourceSymbolicName>] 
+                              <baseFile> [<baseSymbolicName>]
+                              <destinationfile> [<destinationSymbolicName>]
+                              [[<autosave>] <resultFile>]
+                              [<mergeType>]
+                              [<generalOptions>]
+
+                    sourceFile:              {-s | --source}=<filename>
+                    sourceSymbolicName:      {-sn | --srcsymbolicname}=<symbolicname>
+                    baseFile:                {-b | --base}=<filename> 
+                    baseSymbolicName:        {-bn | --basesymbolicname}=<symbolicname>
+                    destinationFile:         {-d | --destination}=<filename>; 
+                    destinationSymbolicName: {-dn | --dstsymbolicname}=<symbolicname>
+                    autosave:                -as | --autosave
+                    resultFile:              {-r | --result}=<filename>
+                    mergeType:               {-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced}
+        
+
+                generalOptions: [<defaultEncoding>] [<comparisonMethod>] [<resultEncoding>]
+
+                    defaultEncoding:     {-e | --encoding}={none |ascii | unicode | bigendian | utf7 | utf8}
+                    resultEncoding:      {-re | --resultencoding}={none |ascii | unicode | bigendian | utf7 | utf8}
+                    comparisonMethod:    {-i | --ignore}={none | eol | whitespaces | eol&amp;whitespaces}
+
+== FsProtectionChanged ==
+Filesystem permissions changed from {0} to {1}.
+
+== CreateXlinkTitle ==
+Create Xlink
+
+== CreateXlinkExplanation ==
+An Xlink is a directory that links to a changeset in a different repository. It's the way to load several repositories in a workspace.
+
+== XlinkTargetServerEntry ==
+Target server, choose or type one
+
+== XlinkTargetServerExplanation ==
+server:port format, i.e: myserver:8087
+
+== XlinkTargetRepositoryEntry ==
+Target repository
+
+== XlinkTargetChangesetEntry ==
+Target changeset
+
+== XlinkNameEntry ==
+Xlink name (name of the directory entry)
+
+== XlinkHint ==
+Remember that the xlinked contents will not be downloaded until you checkin the xlink and update your workspace
+
+== SelectARepository ==
+You need to select a repository before selecting a changeset inside it
+
+== MainMainRuleCreated ==
+You're creating a XLink to the main branch at the target repository.
+            Most likely you're looking to link main branches between the two repositories, so an expansion rule will be created for that matter.
+            If this layout is not what you expected, please edit the expansion rules manually.
+
+== XlinkOptions ==
+Xlink options
+
+== WritableXlinkCheckButton ==
+Writable (otherwise this part of the code tree will be readonly)
+
+== RelativeServerCheckButton ==
+Use relative server - the Xlink tries to get its repository from the local server (recommended if repositories are replicated)
+
+== BranchExpansionRules ==
+Branch expansion rules
+
+== BranchExpansionRulesExplanation ==
+These rules define how source and destination branches are linked. For writable Xlinks you can define a link between main@src and main/fix@dst.
+
+== SelectARepositoryForRule ==
+You need to select a repository before creating a rule
+
+== AddExpansionRuleTitle ==
+Add expansion rule
+
+== AddExpansionRuleExplanation ==
+Define how the branches are expanded between xlinked repositories
+
+== SourceBranch ==
+Source branch
+
+== DestinationBranch ==
+Destination branch
+
+== IsDefinedByUser ==
+Is defined by user
+
+== Yes ==
+Yes
+
+== No ==
+No
+
+== AlreadyDefinedRuleForBranch ==
+You have already defined a rule for this source branch
+
+== XlinkNoChangesetSelected ==
+No changeset has been selected as the target of the Xlink
+
+== EmptyXlinkName ==
+The Xlink directory name is empty
+
+== NoRulesDefined ==
+You have not defined branch expansion rules for this xlink, are you sure you want to continue?
+
+== NoRulesDefinedCaption ==
+No rules defined
+
+== EditXlinkTitle ==
+Edit Xlink
+
+== EditButton ==
+Edit
+
+== EmptySourceBranch ==
+The source branch field cannot be empty.
+
+== EmptyDestinationBranch ==
+The destination branch field cannot be empty.
+
+== LoadingXlinkData ==
+Loading xlink data...
+
+== CreatingDefaultRule ==
+Creating default rule...
+
+== NoContentToCompare ==
+There is no content to compare.
+
+== CreateBranchManualMode ==
+Manual
+
+== CreateBranchTaskMode ==
+From task
+
+== LoadingIssueTrackerExtension ==
+Loading issue tracker extension...
+
+== MarkingTaskAsOpen ==
+Marking '{0}' task as open in '{1}'
+
+== PendingTasks ==
+Pending tasks
+
+== RetrievingTasks ==
+Retrieving pending tasks...
+
+== RetrievingUserTasks ==
+Retrieving pending tasks for user '{0}'...
+
+== DisplayPendingTasksFromAllUsers ==
+Display pending tasks from all users
+
+== MarkAsOpenInIssueTracker ==
+Mark as open in issue tracker
+
+== LinkedTasksViewTitle ==
+Linked tasks
+
+== PlasticTaskIdProperty ==
+ID:
+
+== PlasticTaskOwnerProperty ==
+Owner:
+
+== PlasticTaskStatusProperty ==
+Status:
+
+== PlasticTaskTitleProperty ==
+Title:
+
+== PlasticTaskDescriptionProperty ==
+Description:
+
+== MarkAsOpenTaskTooltip ==
+The task will be marked as open in the issue tracker
+
+== DeleteTaskTooltip ==
+Delete this issue
+
+== LoadingLinkedTasks ==
+Loading tasks to be linked in the issue tracker...
+
+== AddTaskTooltip ==
+Add new issue
+
+== SelectTasksToBeLinkedDialogTitle ==
+Select issues from {0}
+
+== SelectTasksToBeLinkedTitle ==
+Select issues
+
+== SelectTasksToBeLinkedExplanation ==
+Choose issues to be linked to the new changeset
+
+== TaskIdEntryTitle ==
+Issue IDs:
+
+== ManualTaskIdEntryExplanation ==
+You can manually enter a comma-separated issue ID list if you can't find yours above
+
+== UnknownTaskIdsInManualEntry ==
+Invalid issue IDs were found in the manual entry field.
+
+== OpenTaskInBrowserTooltip ==
+Open task info page in a web browser
+
+== DoNotCheckinChangesJustMove ==
+Do not checkin the changes, just move them to the specified branch.
+
+== CreateANewBrachRadioButton ==
+Create a new branch
+
+== CreateANewBranchToCheckinExplanationLabel ==
+Create a child branch of {0} and checkin your workspace changes to that branch.
+
+== CreateANewBranchToMoveChangesetExplanationLabel ==
+Create a child branch of {0} to move changeset cs:{1}.
+
+== CreateANewBranchLabel ==
+Name for child branch
+
+== SelectExistingBranchRadioButton ==
+Select an existing branch (must be empty)
+
+== SelectExistingBranchExplanationLabel1 ==
+Select a previously created branch and checkin your workspaces changes to that branch.
+
+== SelectExistingBranchExplanationLabel2 ==
+The branch base of the selected branch will be changed to be your current base
+
+== SelectExistingBranchToMoveExplanationLabel ==
+Select a previously created branch and move the selected changesets inside it.
+
+== SelectExistingBranchLabel ==
+Selected branch
+
+== MoveChangesNoBranchName ==
+Please specify a child branch name
+
+== MoveChangesSelectABranch ==
+Please select a branch
+
+== MoveChangesBranchMustBeEmpty ==
+The selected branch must be empty
+
+== CantUpdateBraseChangesetBranchWithRevisions ==
+Can't update base changeset for branch because it must be empty
+
+== RetrievingWorskpaceInfo ==
+Retrieving workspace info
+
+== MovingChangesToTargetBranch ==
+Moving changes to target branch...
+
+== UpdatingTargetBranchBase ==
+Updating target branch base...
+
+== CreateCloudEditionTip ==
+If you don't have a Cloud Edition account yet [[BUY_CLOUD|click here]] to create one
+
+== OrganizationUserBelongsTo ==
+Your organization is {0}
+
+== OrganizationNotFoundLine1 ==
+It seems you don't have an organization for {0}
+
+== OrganizationNotFoundLine2 ==
+[[BUY_CLOUD|Click here]]  to create one
+
+== PurchaseCloudEditionURL ==
+https://www.plasticscm.com/plasticscm-cloud-edition/index.html?utm_source=gluon&utm_medium=app&utm_campaign=startup
+
+== NameWorkingMode ==
+User name from the computer
+
+== NameIdWorkingMode ==
+Name + user ID
+
+== ADWorkingMode ==
+Active Directory
+
+== LDAPWorkingMode ==
+LDAP
+
+== UPWorkingMode ==
+Built-in user and password
+
+== TubeWorkingMode ==
+Tube Working Mode
+
+== SSOWorkingMode ==
+Single Sign On
+
+== BuyCloudEdition ==
+If you don't have a Cloud Edition account yet, click {0} to create one.
+
+== BuyCloudEditionClickablePart ==
+here
+
+== RepositoryWillBeKnownAs ==
+Will be known as {0}
+
+== CantCreateLocalRepository ==
+Can't create local repository
+
+== CantCreateCloudRepository ==
+Can't create cloud repository
+
+== CantCreateWorkspace ==
+Can't create workspace
+
+== CantCreateSyncView ==
+Can't create sync view
+
+== CantRetrieveCloudOrganization ==
+Can't retrieve your cloud organization
+
+== SyncViewNameAlreadyExists ==
+Sync view {0} already exist
+
+== StartANewProject ==
+Start a new project
+
+== Distributed ==
+Distributed
+
+== JoinExistingProject ==
+Join an existing project
+
+== Centralized ==
+Centralized
+
+== WelcomeToCloudEdition ==
+Welcome to Plastic SCM Cloud Edition!
+
+== WelcomeToPlasticSCM ==
+Welcome to Plastic SCM!
+
+== WelcomeToGluonTeamEdition ==
+Welcome to Gluon!
+
+== WelcomeToGluonCloudEdition ==
+Welcome to Gluon - Cloud Edition!
+
+== TeamEditionFirstSteps1stCaption ==
+You will be working on your local workspaces connected to your Plastic SCM server
+
+== TeamEditionFirstSteps2ndCaption ==
+You can create different repositories for different projects, and normally one workspace for each repository
+
+== CloudEditionFirstSteps1stCaption ==
+You can work centralized or distributed
+
+== CloudEditionFirstSteps2ndCaption ==
+Centralized means no local repo
+
+== CloudEditionFirstStepsChooseOption ==
+Please choose one path to start working with Plastic Cloud
+
+== TeamEditionFirstStepsChooseOption ==
+Please choose any of the following options to start working with Plastic SCM
+
+== TeamEditionFirstStepsJoinExistingProjectExplanation ==
+Just select an existing repository on your Plastic SCM server and create a new workspace to download it
+
+== CloudEditionFirstStepsNewCloudRepositoryExplanation ==
+To create a new Cloud Edition project, let's first create a repository in Plastic Cloud, and a local one to checkin the changes before pushing to Cloud
+
+== CloudRepository ==
+Cloud repository
+
+== LocalRepositoryName ==
+Local repository name
+
+== NewRepositoryName ==
+New repository name
+
+== WorkspaceName ==
+Workspace name
+
+== PathOnDisk ==
+Path on disk. The place where your files will be on your disk. If you already have a project on disk, you can select the existing path
+
+== MakeWorkspaceDynamic ==
+Make this workspace dynamic
+
+== CreateSyncViewToPushPullCloud ==
+Create a Sync View to push/pull changes to Cloud
+
+== BrowseButton ==
+Browse...
+
+== PerformingRequestedOperations ==
+Performing requested operations...
+
+== CheckingCloudRepositoryAvailable ==
+Checking cloud repository name is available...
+
+== CheckingLocalRepositoryAvailable ==
+Checking cloud repository name is available...
+
+== CheckingWorkspaceAvailable ==
+Checking workspace is available...
+
+== CheckingSyncViewNameAvailable ==
+Checking sync view name is available...
+
+== CreatingCloudRepository ==
+Creating repository {0}@cloud...
+
+== CreatingLocalRepository ==
+Creating repository {0}@local...
+
+== CreatingSyncView ==
+Creating sync view...
+
+== CloudEditionFirstStepsDistributedExplanation ==
+This is the Git way of working, with a local repo and push/pull to the Cloud one
+
+== CloudRepositoryDoNotExist ==
+The repository {0} does not exist on your cloud organization
+
+== CheckingCloudRepositoryExists ==
+Checking cloud repository exists...
+
+== CloudEditionFirstStepsCreateWorkspaceExplanation ==
+Just your workspace connected to the cloud repo. If you are not sure, then this is your option
+
+== NoRepositoriesFound ==
+No repositories found. Check that your Plastic SCM server is running and that there are repositories on it
+
+== CloudRepositories ==
+Cloud repositories
+
+== SyncFromLocalToCloudViewName ==
+Sync {0} from local to cloud
+
+== SyncToRepository ==
+Sync to {0}
+
+== SyncFromRepository ==
+Sync from {0}
+
+== LocalServerDetected ==
+Local server {0} detected
+
+== LocalServerDetectedDvcsMode ==
+Local server detected
+
+== UseSsl ==
+Use SSL
+
+== TeamEditionFirstStepsJoinTeamExplanation ==
+To start a new project, you can create a new repository in your Plastic SCM server
+
+== ConfirmDeleteChangesetCaption ==
+Confirm changeset delete
+
+== DeleteChangesetWarning ==
+Are you sure you want to delete the changeset:
+{0}?
+
+== CantDeleteChangesetCaption ==
+Unable to delete the changeset
+
+== CantDeleteChangeset ==
+The current changeset cannot be deleted because it is referenced by another item.
+
+Check that:
+ * The changeset is not the source of a merge link
+ * The changeset has no children
+ * The changeset is not labelled
+ * No shelvesets were created from the changeset
+
+Note, you can find shelvesets created from a given changeset by running the following query from the cli or Shelves view:
+
+    find shelve where parent=changesetspec
+
+== DeleteWorkingChangesetCaption ==
+Delete working changeset
+
+== DeleteWorkingChangeset ==
+Deleting the changeset you are changing in your workspace configuration. Continue?
+
+== CannotDeleteCsetWithPendingChanges ==
+Cannot delete the selected changeset since there are pending changes. Please review the pending changes and retry the operation.
+
+== CannotMoveCsetWithPendingChanges ==
+Cannot move the selected changeset since there are pending changes. Please review the pending changes and retry the operation.
+
+== ReportChanged ==
+Changed items
+
+== ReportAdded ==
+Added items
+
+== ReportDeleted ==
+Deleted items
+
+== ReportMoved ==
+Moved items
+
+== ReportLoaded ==
+Loaded items
+
+== ReportUnloaded ==
+Unloaded items
+
+== ShowUpdateReportButton ==
+Show update report
+
+== ClearReportButton ==
+Clear report
+
+== HideUpdateReportButton ==
+Hide update report
+
+== ReportUpdatedHeader ==
+Updated
+
+== ConfigurationAppliedHeader ==
+Configuration applied
+
+== ZoomIn ==
+Zoom in
+
+== ZoomOut ==
+Zoom out
+
+== RemoveFilter ==
+Remove filter
+
+== SelectedBranchesAndRelated ==
+{0} and related branches
+
+== SelectedBranchesAndPendingMerges ==
+{0} and pending merges
+
+== DownloadingRevisions ==
+Downloading revisions...
+
+== GoToSourceChangesetMenuItem ==
+Go to source changeset
+
+== GoToDestinationChangesetMenuItem ==
+Go to destination changeset
+
+== Name ==
+Name:
+
+== NewName ==
+New name:
+
+== NoCsetCreatedWarning ==
+A new changeset was not created because the file data did not change
+
+== AllFileConflictsWereMergedWarning ==
+All files merged and are ready for checkin
+
+== SomeFileConflictsWereMergedWarning ==
+Only some files were merged and are ready for checkin
+
+== NoFileConflictsWereMergedWarning ==
+No files were merged
+
+== SaveDiffChangesTitle ==
+Do you want to save the changes you made to the current file?
+
+== SaveDiffChangesMessage ==
+Your changes will be lost if you don't save them
+
+== DontSaveButton ==
+Don't save
+
+== SelectFileToSeeDifferences ==
+Select a file to see its differences
+
+== SaveThisRevisionAs ==
+Save this revision as...
+
+== SaveRevisionAs ==
+Save revision as...
+
+== SavingRevision ==
+Saving revision to '{0}'...
+
+== DownloadFilesProgress ==
+Downloaded {0} of {1} ({2} of {3} files to download)
+
+== DownloadInfoSingular ==
+Will download 1 file {0}
+
+== DownloadInfoPlural ==
+Will download {0} files {1}
+
+== NotifyLinuxWatchLimitWarning ==
+The maximum number of watched items was reached. You can increase its value executing 'sudo sysctl fs.inotify.max_user_watches=524288'
+
+== CheckinProgressMultiThreadUploading ==
+Multi-thread checkin
+
+== CheckinProgressMultiThreadNumOfBlocks ==
+uploading {0} blocks in parallel
+
+== SkipDiffMergeTracking ==
+Skip merge tracking
+
+== SkipDiffMergeTrackingTooltip ==
+Do not group file changes by merge source. Each file is displayed once, with its 'total' changes
+
+== FetchNoDataCheckButton ==
+Do not replicate data (you need to be the admin of your server)
+
+== FetchNoDataNoPermissions ==
+You need to be the administrator of the destination server to use the 'do not replicate data' option.
+
+== CheckingFetchNoDataNoPermissions ==
+Checking permissions...
+
+== CheckinProgressUploadingFiles ==
+Uploading {0} files
+
+== CheckinProgressUploadingFileData ==
+Uploading file {0} ({1}) to the repository
+
+== CheckinProgressOf ==
+of
+
+== ToggleDetails ==
+Toggle details
+
+== ShowDetails ==
+Show details
+
+== HideDetails ==
+Hide details
+
+== ToggleDetailsButtonTooltip ==
+Hide/show details area
+
+== NoDiffToolDefined ==
+There aren't any diff tools defined in the client configuration file
+
+== FileProperties ==
+File properties
+
+== FileHistory ==
+File history
+
+== Comment ==
+Comment
+
+== OpenButton ==
+Open
+
+== StatusAtWorkspace ==
+{0} at {1} workspace
+
+== UnsupportedBinaryType ==
+Unsupported file type for binary diff.
+
+== ApplyAttributesButton ==
+Apply attributes...
+
+== ApplyAttribute ==
+Apply an attribute to the selected object
+
+== ApplyAttributeExplanation ==
+Select the attribute type to apply in the "Attribute" dropdown list; the "Value" field lets you choose an existing value from the drop down list or type a new value.
+
+== AttributeLabel ==
+Attribute:
+
+== AttributeValueLabel ==
+Value:
+
+== LoadingAttributes ==
+Loading attributes...
+
+== LoadingAttributeValues ==
+Loading attribute values...
+
+== SelectAttribute ==
+Select an attribute
+
+== SelectAttributeValue ==
+Enter an attribute value
+
+== ApplyingAttribute ==
+Applying attribute...
+
+== SettingAttributeValue ==
+Setting new value...
+
+== DeletingAttribute ==
+Deleting attribute...
+
+== AnnotateDays ==
+days
+
+== AnnotateLocalRevision ==
+local
+
+== AnnotateAuthorField ==
+Author: 
+
+== AnnotateDateField ==
+Date: 
+
+== AnnotateBranchField ==
+Branch: 
+
+== AnnotateChangesetField ==
+Changeset: 
+
+== AnnotateChangedDuringMerge ==
+Changed during merge: 
+
+== ComboBoxValuesReduced ==
+We only loaded the last 500 values. Otherwise, the dropdown control takes forever to load.
+
+== CreateAttribute ==
+Create a new attribute
+
+== CreateAttributeExplanation ==
+Type a name for the new attribute. It will be created in '{0}'
+
+== AttributeNameLabel ==
+Attribute name:
+
+== AttributeCommentLabel ==
+Comments:
+
+== AttributeHelpLabel ==
+Add a line using the format 'default: value1, "value two", ..., valueN' to define default values for this attribute.
+
+== EnterAttributeName ==
+Please enter a name
+
+== CreatingAttribute ==
+Creating attribute...
+
+== AttributeNameAlreadyExists ==
+The attribute {0} already exists ({1})
+
+== MergeToPendingFileConflicts ==
+There are pending file conflicts that must be resolved before processing the merge-to.
+
+== CommentsDialogTitle ==
+Comments
+
+== CommentsDialogExplanation ==
+Enter a comment for merge-to checkin operation:
+
+== BranchMergeTo ==
+Server side merge – from branch {0} to branch {1}
+
+== LabelMergeTo ==
+Server side merge – from label {0} to branch {1}
+
+== ChangesetMergeTo ==
+Server side merge – from changeset cs:{0} to branch {1}
+
+== CheckinMergeTo ==
+Checkin merge!
+
+== MergeBranch ==
+Merge from branch {0}
+
+== ChangesetIntervalCherryPick ==
+Cherry pick from changeset interval (cs:{0} - cs:{1}]
+
+== BranchCherryPick ==
+Cherry pick from branch {0}
+
+== ChangesetCherryPick ==
+Cherry pick from changeset cs:{0}
+
+== LabelMerge ==
+Merge from label {0}
+
+== CherrypickSubtractiveMerge ==
+Subtractive merge from changeset cs:{0}
+
+== IntervalCherrypickSubtractiveMerge ==
+Subtractive merge from changeset interval (from cs:{0} to cs:{1})
+
+== ChangesetMerge ==
+Merge from changeset cs:{0}
+
+== OverlappedMerge ==
+Update-to/merge-from latest changeset cs:{0}
+
+== SwitchBranchButton ==
+Switch branch...
+
+== SwitchBranch ==
+Switch to branch
+
+== OwnerColumn ==
+Owner
+
+== PleaseSelectBranch ==
+Please select a branch
+
+== PleaseTypeAPath ==
+Please enter a path
+
+== Copy ==
+Copy
+
+== AnnotateOptions ==
+Annotate options
+
+== AnnotateDiffBranchMenuItem ==
+Diff branch {0}
+
+== AnnotateDiffChangesetMenuItem ==
+Diff changeset {0}
+
+== AnnotateParentRevisionMenuItem ==
+Annotate parent revision
+
+== AnnotateParentChangesetMenuItem ==
+Annotate before these changes (parent of cs:{0})
+
+== AnnotateShowDate ==
+Show date modified
+
+== AnnotateShowChangeset ==
+Show changeset
+
+== AnnotateShowBranch ==
+Show branch
+
+== AnnotateShowAuthor ==
+Show author
+
+== AnnotateShowLineAge ==
+Show line age
+
+== AnnotateShowRevInMerge ==
+Show whether line was changed in a merge
+
+== AnnotateDisplayShortBranchNames ==
+Display short branch names
+
+== AnnotateDisplayFullBranchNames ==
+Display full branch names
+
+== Shelve ==
+Shelve
+
+== AnnotateDialogTitle ==
+Annotate
+
+== AnnotateCantFindRevisionAtChangeset ==
+Cannot find revision in changeset cs:{0}
+
+== AnnotateNoPreviousRevision ==
+There is no previous version for this item.
+
+== AnnotateCantRunOnBinaryFiles ==
+Binary files can not be annotated. If the file is actually plain text, you can change its revision type from the context menu in the Workspace Explorer or force it using the filetypes.conf configuration file.
+
+== ChangesetsDynamicViewTitle ==
+Changesets {0}
+
+== UserProfileServerLabel ==
+Server:
+
+== UserProfileServerProfileNotFound ==
+No connection profile found for server '{0}', please configure one.
+
+== UserProfileWrongAuthMode ==
+The user profile can only be configured using LDAP or User/Password authentication.
+
+== LoadingUserProfile ==
+Loading user profile...
+
+== NoProfileToShow ==
+There is not defined profile to show
+
+== SavingUserProfile ==
+Saving user profile...
+
+== EnterValidEmailAddress ==
+Please enter a valid email address.
+
+== EnterValidIntValue ==
+Please enter a valid integer value.
+
+== UserProfileLoadError ==
+Cannot retrieve the profile from {0}. Details: {1}
+
+== UserProfileSaveError ==
+Cannot save the profile for {0}. Details: {1}
+
+== PendingChangesOptionsDialogTitle ==
+Pending Changes - Options
+
+== PendingChangesWhatToFindTab ==
+What to find
+
+== PendingChangesWhatToShowTab ==
+What to show
+
+== PendingChangesMoveDetectionTab ==
+Move detection
+
+== PendingChangesAdvancedMoveDetectionTab ==
+Advanced move detection
+
+== PendingChangesWhatToFindDialogTitle ==
+Configure how to find changes in the workspace
+
+== PendingChangesWhatToFindDialogExplanation ==
+You can finely tune how Plastic finds changes on disk and what to skip
+
+== PendingChangesWhatToShowDialogTitle ==
+Configure the types of changes to display
+
+== PendingChangesWhatToShowDialogExplanation ==
+From auto-refresh to deciding if you want to see private files, ignored and more
+
+== PendingChangesMoveDetectionDialogTitle ==
+Configure how Plastic finds moved files and directories in your workspace
+
+== PendingChangesMoveDetectionDialogExplanation ==
+It can detect files and directories that you moved or renamed on disk
+
+== PendingChangesAdvancedMoveDetectionDialogTitle ==
+Boost change detection using the NTFS journal
+
+== PendingChangesAdvancedMoveDetectionDialogExplanation ==
+It is an advanced feature helpful to perform complex refactors, but use with care
+
+== PendingChangesFilesystemWatcherEnabled ==
+File system watcher is enabled
+
+== PendingChangesFilesystemWatcherDisabled ==
+File system watcher is disabled
+
+== PendingChangesFilesystemWatcherEnabledExplanation ==
+Plastic watches the workspace for changes to make the operation faster. This removes the need to walk the directory structure, although move matching can still consume time.
+
+== PendingChangesFilesystemWatcherDisabledExplanation ==
+This is not normal and can affect performance. Plastic watches the workspace for changes using the Windows API. This way it doesn't need to walk the directory structure. If it is disabled, the operation can be much slower. Contact support for help unless it was disabled in client.conf intentionally. [[HELP_URL|{0}]]
+
+== PendingChangesShowCheckouts ==
+Show checkouts
+
+== PendingChangesShowCheckoutsExplanation ==
+Shows files that you explicitly checkedout in Plastic. Also, files that you moved using Plastic GUIs or command line. And finally, files involved in a merge in progress.
+Checkouts display super-fast because they are on a list; no need to walk the directory structure to find them.
+Tip: With a workspace larger than 800k files, it may make sense to use only checkouts for faster operation. Checkouts are also needed if you use file locks.
+
+== PendingChangesFindChanged ==
+Find changed files in the workspace
+
+== PendingChangesFindChangedExplanation ==
+Walks the workspace directory structure to find changed files (timestamp changed).
+
+== PendingChangesCheckFileContent ==
+Check the content to determine files as changed, not just timestamp
+
+== PendingChangesCheckFileContentExplanation ==
+When the timestamp of a file is modified, calculate the hash with the previous before setting it as changed. Useful with applications that save files without performing any changes. Warning: It can make "pending changes" slower because it requires reading and hashing files.
+
+== PendingChangesAutoRefresh ==
+Auto-refresh
+
+== PendingChangesAutoRefreshExplanation ==
+Let Plastic refresh the Pending Changes list as needed to avoid manual refreshing.
+
+== PendingChangesGroupInChangeLists ==
+Group changes in "change lists"
+
+== PendingChangesGroupInChangeListsExplanation ==
+Plastic can group the changes in the workspace in user created lists. This is useful if you miss the feature from previous version control.
+
+== PendingChangesShowPrivateFiles ==
+Show private files
+
+== PendingChangesShowPrivateFilesExplanation ==
+List files that are not under source control. They can be recently added files, but sometimes are tool-generated content that you want to ignore. (Adding to "ignored" can be a better option.)
+
+== PendingChangesAlwaysSelectPrivateFiles ==
+Always select private files
+
+== PendingChangesAlwaysSelectPrivateFilesExplanation ==
+This way you won't forget new files on checkin. But you need to have a good ignore.conf to avoid adding temporary files to version control.
+
+== PendingChangesShowIgnoredFiles ==
+Show ignored files
+
+== PendingChangesShowIgnoredFilesExplanation ==
+Show files that you previously ignored by adding them to ignore.conf.
+
+== PendingChangesShowHiddenFiles ==
+Show hidden files
+
+== PendingChangesShowHiddenFilesExplanation ==
+Show files that you previously hid by adding them to hidden_changes.conf.
+
+== PendingChangesShowDeletedFiles ==
+Show deleted files and directories
+
+== PendingChangesShowDeletedFilesExplanation ==
+Show files that you deleted manually in the workspace outside of Plastic control. (Not using a GUI or a command, but simply deleting them from disk.)
+
+== PendingChangesMoveDetectionExplanation ==
+You can tell Plastic that you moved a file using "cm mv" or moving files from the GUIs or IDE integrations. This method doesn't require "detection". But, if you move files directly on disk, Plastic can still detect the operation. It applies to directories too.
+
+== PendingChangesFindMovedFiles ==
+Find moved and renamed files and directories
+
+== PendingChangesFindMovedFilesExplanation ==
+Walks the workspace finding possible moves. For example, if you rename foo.c to bar.c, Plastic will find bar.c as added, foo.c as deleted, and it will try to match them. It can be slow if you have lots of private files.
+
+== PendingChangesMoveDetectionFineTune ==
+You can fine tune how "find moves" works:
+
+== PendingChangesMatchBinarySameExtension ==
+Match binary files only when they have the same extension
+
+== PendingChangesMatchBinarySameExtensionExplanation ==
+Doesn't try to match a .png with a .jpg. But it won't find a .doc to .docx rename.
+
+== PendingChangesMatchTextSameExtension ==
+Match text files only when they have the same extension
+
+== PendingChangesMatchTextSameExtensionExplanation ==
+Doesn't try to match a .cs with a .c. It can be useful in some circumstances.
+
+== PendingChangesSimilarityPercentage ==
+Similarity percentage
+
+== PendingChangesSimilarityPercentageExplanation ==
+Defines "how similar" the comparison needs to be for two files to be detected as moved or renamed. For example, if you move foo.c to bar.c and modify it later, the % defines how similar they need to be so that Plastic considers them the same file.
+It applies to directories too: how similar the directory structure needs to be: how many moved children relative to the total of directory entries.
+For binaries, the % means the allowed difference in size.
+
+== PendingChangesEnableNTFSJournal ==
+Enable precise tracking using the NTFS journal
+
+== PendingChangesEnableNTFSJournalExplanation ==
+Use the NTFS journal to detect moved files and directories while the GUI is open. It is super precise and there is no "guessing" or heuristic. NTFS knows when a file or directory is moved.
+
+But, there is a drawback. It is not safe to use it if you refactor your project with tools like Visual Studio. This is because VS doesn't simply move foo.c to src/bar.c, but, creates a new src/bar.c, copies the content, and then deletes foo.c. There is no way to track it from the filesystem.
+
+If you plan to do a big refactor using the Windows Explorer or the command line, it will work smoothly.
+
+== PendingChangesChangeTrackerServiceNotRunning ==
+Plastic Change Tracker service is not running
+
+== PendingChangesChangeTrackerServiceNotRunningExplanation ==
+Cannot communicate with the Plastic Change Tracker service. Ensure that it is installed and running.
+
+== PendingChangesINotifyEnabled ==
+inotify change watcher is enabled
+
+== PendingChangesINotifyDisabled ==
+inotify change watcher is disabled
+
+== PendingChangesINotifyEnabledExplanation ==
+Plastic watches the workspace for changes to make the operation faster. This removes the need to walk the directory structure, although move matching can still consume time. Plastic takes advantage of inotify, but it needs some tuning to work correctly. Check: {0}
+
+== PendingChangesINotifyDisabledExplanation ==
+Pending changes performance improves greatly when it can take advantage of the inotify-based detection system. Check the following instructions to enable it: {0} and restart the GUI
+
+== MergeToMergeNeededExplanation ==
+While the merge-to operation was running, new changesets were created in the destination of the merge-to operation, creating more than one head. Consider unifying them by running a new merge (or merge-to) operation. Affected branches:
+
+== MergeToMergeNeededBranch ==
+{0}@{1}@{2} (mount '{3}')
+
+== MergeToNeededQuestion ==
+A new changeset has been created at branch {0}@{1}@{2} (mount '{3}') during the merge-to operation. You need to merge again to complete the operation. Do you want to merge again now?
+
+== DontShowItAgain ==
+Got it, don't show me again
+
+== LearnMore ==
+Learn more
+
+== HelpActionNotFound ==
+Sorry we forgot to add the action :(
+
+== DaysAgo ==
+{0} days ago
+
+== HoursAgo ==
+{0} hours ago
+
+== MinutesAgo ==
+{0} minutes ago
+
+== SecondsAgo ==
+{0} seconds ago
+
+== JustNow ==
+Just now
+
+== RemovedLocallyStatus ==
+Removed locally
+
+== RemovedStatus ==
+Removed
+
+== MovedLocallyStatus ==
+Moved locally
+
+== MovedStatus ==
+Moved
+
+== AddedStatus ==
+Added
+
+== IgnoredStatus ==
+Ignored
+
+== PrivateStatus ==
+Private
+
+== ReplacedStatus ==
+Replaced
+
+== CopiedStatus ==
+Copied (new)
+
+== CheckedOutStatus ==
+Checked-out
+
+== ChangedStatus ==
+Changed
+
+== HiddenChangedStatus ==
+Hidden changed
+
+== UnsupportedImageFormat ==
+Unsupported image format
+
+== ShowPropertiesButton ==
+Show properties
+
+== PreviewConfigAlreadyExist ==
+Another configuration exists with this name, please choose other name
+
+== UserDefinedPreview ==
+User-defined tool
+
+== ConfirmDeleteDiffTool ==
+Do you want to delete this diff tool configuration?
+
+== ConfirmDeleteMergeTool ==
+Do you want to delete this merge tool configuration?
+
+== CloudEditionConfigInsertValidEmail ==
+Enter a valid email address, or username
+
+== CloudEditionConfigInsertValidPassword ==
+Enter a valid password
+
+== CloudEditionConfigurationWelcome ==
+Welcome to Cloud Edition!
+
+== CloudEditionConfigurationExplanation ==
+Please enter the user and password you use to connect to Plastic Cloud (same as plasticscm.com). This way you won't be prompted again when replicating to Cloud.
+
+== CloudEditionConfigurationExtraExplanation ==
+This is also the user name that will identify you each time you checkin, so choose wisely.
+
+== CloudEditionConfigCheckingCredentials ==
+Checking credentials...
+
+== CloudEditionConfigEmail ==
+User name (typically your plasticscm.com email)
+
+== CloudEditionConfigPassword ==
+Password
+
+== CloudEditionConfigCheckCredentials ==
+Check credentials
+
+== CloudEditionBuyText ==
+If you don't have a Cloud Edition account yet, click here to create one.
+
+== CloudEditionBuyLinkText ==
+If you don't have a Cloud Edition account yet, click [[BUY_CLOUD|here]] to create one.
+
+== SelectFieldsMergeDiffOptions ==
+Fill in all Merge/Diff option fields
+
+== SelectFieldsMergeDiffOptionsCaption ==
+Fill in all fields
+
+== EOLMethod ==
+Ignore EOLs
+
+== WhitespacesMethod == 
+Ignore whitespaces
+
+== EOLWhitespacesMethod ==
+Ignore EOLs and whitespaces
+
+== NoneMethod ==
+Recognize all
+
+== DiffVariables ==
+You can use the following command-line parameters when invoking the external diff tool.
+It's up to you to ensure that the specified files have the contents of the revisions to be compared.
+
+    @sourcefile: full path of file whose contents will be displayed in left panel
+    @destinationfile: full path of file whose contents will be displayed in right panel
+
+    @sourcesymbolic: "left file" string to be displayed in control panel
+    @destinationsymbolic: "right file" string to be displayed in control panel
+
+    @sourcehash: MD5 string calculated from @leftrev file contents
+    @destinationhash: MD5 string calculated from @rightrev file contents
+
+    @filetype: MIME type, used for syntax highlighting
+    @comparationmethod: comparison method used
+    @fileencoding: default file encoding to use when no encoding is detected
+
+Examples:
+
+  Semantic Merge Tool:
+  https://semanticmerge.com/documentation/how-to-configure/semanticmerge-configuration-guide#ConfiguringSemanticMergeastheDiffTool13
+
+    <semanticmerge-path>\semanticmergetool.exe -s="@sourcefile"
+      -sn="@sourcesymbolic" -d="@destinationfile" -dn="@destinationsymbolic" -i="@comparationmethod"
+      -e="@fileencoding" -edt=default
+
+  Kdiff3
+  http://kdiff3.sourceforge.net/doc/documentation.html
+
+    <kdiff3-path>\kdiff3.exe" "@sourcefile" "@destinationfile" --L2 "@sourcesymbolic" --L3 "@destinationsymbolic"
+
+  Araxis Merge
+  https://www.araxis.com/merge/documentation-windows/command-line.en
+
+    <araxis-path>\compare.exe" /title1:"@sourcesymbolic" /title2:"@destinationsymbolic" "@sourcefile" "@destinationfile"
+
+== NoDiffType ==
+Specify the file type that will be processed by this diff tool.
+
+== NoDiffTool ==
+Specify a command line for this diff tool.
+
+== DiffToolError ==
+Diff tool error
+
+== DiffNoExt ==
+No suffix specified for the diff tool.
+
+== NoTxtDiff ==
+No diff tool specified for text files.
+
+== NoBinDiff ==
+No diff tool specified for binary files.
+
+== NoDiffForExt ==
+No diff tool specified for the {0}.
+
+== DiffToolsError ==
+Diff tools error
+
+== NoDiscoveredServers ==
+No servers were found.
+
+== DownloadPreviewSoftware ==
+You need to install [[{0}|{1}]] to generate previews with this provider
+
+== ExecutableOpenFileDialogFilterWin ==
+Executable files (*.exe; *.bat;)|*.exe; *.bat|All files (*.*)|*.*
+
+== ExecutableOpenFileDialogFilterNoWin ==
+All files (*.*)|*.*
+
+== ValidatePreviewTypeName == 
+Please type a name
+
+== ValidatePreviewAddExtension ==
+Please add at least one supported extension
+
+== NullRefText ==
+An error occurred processing your request.
+
+== PathTooLong ==
+The path is too long
+
+== ServerNullRefText ==
+An unexpected error has occurred on server. For more information check the server log.
+
+== MsgInformative ==
+Information
+
+== MsgWarning ==
+Warning
+
+== MsgError ==
+Error
+
+== OptionsGeneral ==
+General
+
+== OptionsDiff ==
+Diff and merge
+
+== OptionsDiffTools ==
+Diff tools
+
+== OptionsMergeTools ==
+Merge tools
+
+== OptionsOther ==
+Other options
+
+== OptionsProfiles ==
+Connection Profiles
+
+== OptionsExternalPreviewTools ==
+Preview tools
+
+== OptionsUserProfile ==
+User Profile
+
+== MergeVariables ==
+The following variables are available to use as arguments when invoking the external merge tool in the command line:
+
+    @sourcefile: full path of the source merge file  
+    @destinationfile: path of the destination merge file
+    @basefile: path of the common ancestor merge file
+
+    @output: path of the merge result file
+
+    @sourcesymbolic: symbolic name of the source contributor
+    @destinationsymbolic: symbolic name of the destination contributor
+    @basesymbolic: symbolic name of the common ancestor contributor
+
+    @sourcehash: MD5 string calculated from the source file content
+    @destinationhash: MD5 string calculated from the destination file content
+    @basehash: MD5 string calculated from the common ancestor file content
+
+    @filetype: MIME type used for the syntax highlight
+    @comparationmethod: comparison method used
+    @fileencoding: default file encoding to use when no encoding is detected
+    @resultencoding: result file encoding (NONE -> it will be calculated from contributors encodings)
+    @mergetype: type of merge used
+    @progress: a progress string indicating the current operation, for example Merging file 3/10
+    @extrainfofile: path of a file that contains extra information about the current merge
+
+Examples:
+
+  Semantic Merge Tool:
+  https://semanticmerge.com/documentation/how-to-configure/semanticmerge-configuration-guide#ConfiguringSemanticMergeastheMergeTool15
+
+    <semanticmerge-path>\semanticmergetool.exe -b="@basefile" -bn="@basesymbolic" -s="@sourcefile" -sn="@sourcesymbolic"
+      -d="@destinationfile"  -dn="@destinationsymbolic" -r="@output" -i="@comparationmethod"
+      -e="@fileencoding" -emt=default -edt=default
+
+  Kdiff3:
+  http://kdiff3.sourceforge.net/doc/documentation.html
+
+    <kdiff3-path>\kdiff3.exe" "@basefile" "@sourcefile" "@destinationfile"
+      -o @output --L1 "@basesymbolic"  --L2 "@sourcesymbolic" --L3 "@destinationsymbolic"
+
+  Araxis Merge:
+  https://www.araxis.com/merge/documentation-windows/command-line.en
+
+    <araxis-path>\compare.exe" /wait /a1 /3 /title1:"@basesymbolic" 
+      /title2:"@sourcesymbolic" /title3:"@destinationsymbolic" "@basefile" "@sourcefile"
+      "@destinationfile" "@output"
+
+== NoMergeType ==
+Specify the file type that will be processed by this merge tool.
+
+== NoMergeTool ==
+Specify the command line for this merge tool.
+
+== MergeToolError ==
+Merge tool error
+
+== MergeNoExt ==
+No suffix specified for the merge tool.
+
+== NoTxtMerge ==
+No suffix specified for the merge tool.
+
+== NoBinMerge ==
+No merge tool specified for binary files.
+
+== NoMergeForExt ==
+No merge tool specified for the {0}.
+
+== MergeToolsError ==
+Merge tools error
+
+== ConfirmDeletePreviewProvider ==
+Are you sure you want to delete the selected preview tool?
+
+== CreateNewProfileTitle ==
+Add a new profile to connect to a server
+
+== EditProfileTitle ==
+Edit an existing server connection profile
+
+== ProfileNameInputLabel ==
+Give a name to the profile
+
+== ProfileConnectionTypeLabel ==
+Select the connection type
+
+== ProfileConnOnDemand ==
+On demand
+
+== ProfileConnOnDemandTooltip ==
+The profile will be only used when a connection to the stored server is established.
+
+== ProfileConnAuto ==
+Automatic
+
+== ProfileConnAutoTooltip ==
+The stored server will show up in the repositories view list. Use this options for always-reachable servers.
+
+== ProfileDialogExplanation ==
+A connection profile enables you to store remote servers authentication parameters.
+
+== ProfileNameEmpty ==
+Profile name cannot be empty.
+
+== ProfileNameAlreadyExists ==
+The profile name already exists
+
+== DeleteProfileConfirmation ==
+You are going to delete the selected profile. Continue?
+
+== DeleteProfileCaption ==
+Delete profile
+
+== NotValidProxyServer ==
+The specified server {0} is not a valid Proxy server.
+
+== ConnectedOk ==
+Connected OK
+
+== ConfigurationUserNameInfo ==
+The following username will be used:
+
+== ConfigurationCredentialsInfo ==
+Configure your credentials
+
+== PlasticConfiguration ==
+Plastic SCM Configuration
+
+== ConfigurationServerInfo ==
+Enter the name (or IP address) and port of your Plastic SCM server. You can use "scan network" to find available Plastic SCM servers on your network
+
+== ConfigureProxy ==
+Use a Proxy server
+
+== Preferences ==
+Preferences
+== SwitchModeConfirmationDialogTitle ==
+Switch mode confirmation
+
+== SwitchModeConfirmationDialogExplanation ==
+You are in {0} mode. Do you really want to switch to {1} mode?
+
+Learn more about Gluon here: {2}
+
+== DeveloperMode ==
+Developer
+
+== GluonMode ==
+Gluon
+
+== ReloadButton ==
+Reload
+
+== OpenGUIButton ==
+Open GUI
+
+== AllCheckButton ==
+All
+
+== SearchTooltip ==
+Search
+
+== CannotLaunchInProgressMergeFromNotRootMountPoint ==
+Can't continue with this merge. The merge in progress takes place in a xlinked repository. This option is only available when the merge in progress takes place in the repository of the root workspace. Please launch the merge manually to continue.
+
+== OneVersionBehind ==
+you are 1 version behind
+
+== TwoOrMoreVersionsBehind ==
+you are {0} versions behind
+
+== GitSyncAllRefsRejected ==
+All sent references (branches or tags) were rejected by the server, so nothing was pushed. Check the configuration of your Git server provider for more info. Failed to push:{0}
+
+== LoggingIn ==
+Logging in as '{0}'...
+
+== SigningUp ==
+Creating account '{0}'...
+
+== GettingDatacenters ==
+Getting datacenters ...
+
+== EnterOrganizationName ==
+Please enter a organization name
+
+== NoDatacenterSelected ==
+Please select a datacenter
+
+== CreatingOrganization ==
+Creating organization '{0}'...
+
+== OrganizationNameTooShort ==
+Organization name must be at least three characters long
+
+== Login ==
+Login
+
+== LoginTitle ==
+Use your existing plasticscm.com account to login
+
+== LoginButton ==
+Login
+
+== SignUp ==
+Sign up
+
+== SignUpTitle ==
+Create a plasticscm.com account
+
+== SignUpNeeded ==
+Can't find the account {0}, please create a plasticscm.com account
+
+== SignUpButton ==
+Sign up
+
+== SignInButton ==
+Sign in
+
+== SignInToPlasticSCM ==
+Sign in to Plastic SCM
+
+== SignInWithGoogle ==
+Sign in with Google
+
+== SignInWithUnityID ==
+Sign in with Unity ID
+
+== SignInWithEmail ==
+Sign in with Email
+
+== SignInWithOkta ==
+Sign in with Okta
+
+== SignInWithSSO ==
+Sign in with SSO
+
+== ConfirmPassword ==
+Confirm password:
+
+== SignedUpTitle ==
+You correctly signed up to plasticscm.com!
+
+== LoggedInTitle ==
+You correctly logged in to plasticscm.com!
+
+== CreateFirstOrganizationLabel ==
+Now it is time to create your Cloud Organization
+
+== CreateOtherOrganizationLabel ==
+Or maybe you prefer to create your own
+
+== YouBelongToOrganization ==
+You belong to the organization:
+{0}
+
+== YouBelongToSeveralOrganizations ==
+You belong to several organizations:
+
+== JoinButton ==
+Join
+
+== CreateOrganizationTitle ==
+Create your cloud organization
+
+== OrganizationName ==
+Organization name:
+
+== Datacenter ==
+Datacenter:
+
+== DatacenterExplanation ==
+The closest is already selected :)
+
+== EncryptionCheckButton ==
+Encrypt all data sent to Plastic Cloud
+
+== EncryptionCheckButtonExplanation ==
+You can force that all data sent to Plastic Cloud is encrypted before leaving your computers. This way you ensure your data can't be compromised. If you select this option, all the organization members will have to share the same secret key to encrypt/decrypt data.
+{0}
+
+== CreatedOrganizationTitle ==
+Organization created correctly
+
+== CreatedOrganizationExplanation ==
+The organization {0} was created correctly
+
+== ContinueButton ==
+Continue
+
+== RetryButton ==
+Retry
+
+== CloudEditionOrganization ==
+You are part of the organization {0}
+
+== SignUpAgreeTo ==
+By clicking 'Sign up' below, you agree to our {0} and {1}. We'll occasionally send you account-related emails.
+
+== SignUpAgreeToShort ==
+By clicking 'Sign up', you agree to our {0} and {1}
+
+== SigninAgreeToShort ==
+By clicking 'Sign in', you agree to our {0} and {1}
+
+== TermsOfService ==
+Terms of Service
+
+== PrivacyPolicy ==
+Privacy Policy
+
+== Email ==
+Email:
+
+== BackButton ==
+< Back
+
+== LastThingTitle ==
+One last thing
+
+== LastThingExplanation ==
+There are two Plastic flavors.
+You can use both, anytime.
+
+== PlasticForDevelopersTitle ==
+Plastic for developers
+
+== PlasticForDevelopersExplanation ==
+The classic Plastic GUI, good for branches, merges and push/pull
+
+== PlasticForArtistsTitle ==
+Gluon - Plastic for artists
+
+== PlasticForArtistsExplanation ==
+Super simple GUI for artists in game dev, or anyone who prefers to simply checkin and forget
+
+== LaunchButton ==
+Launch
+
+== LaunchGluonButton ==
+Launch Gluon
+
+== ReplyButton ==
+Reply
+
+== CommentButton ==
+Comment
+
+== DiscardUnsavedChangesTitle ==
+Discard changes
+
+== DiscardUnsavedChangesQuestion ==
+Are you sure you want to discard your unsaved changes?
+
+== DiscardButton ==
+Discard
+
+== DeleteCommentQuestion ==
+Are you sure you want to delete this?
+
+== CheckingLockRulesProgress ==
+Checking if item can be locked...
+
+== ConfigLocksNoPermissions ==
+You don't have the configlocks permission. Please ask your administrator to grant you the 'configlocks' permission on repository '{0}', or to configure a lock rule for this file.
+
+== ConfigLocksItemNoExtensionMessage ==
+File {0} doesn't have an extension. At the moment this option doesn't allow configuring lock rules for files without an extension.
+
+== AddLockRuleAndCheckoutTitle ==
+Add lock rule and checkout
+
+== AddLockRuleAndCheckoutMessage ==
+To lock a file, you must first configure a lock rule.{0}{0}Choose one of the following options to configure which files are automatically locked on checkout.
+
+== AddLockRuleRadioGroup ==
+Choose a locking rule or create your own
+
+== AddLockRuleExtensionOption ==
+Lock files matching {0}
+
+== AddLockRuleNameOption ==
+Lock any file with name '{0}'
+
+== AddLockRuleDirectoryOption ==
+Lock all files in directory{0}{1}
+
+== AddLockRuleFullPathOption ==
+Lock only{0}{1}
+
+== AddLockRuleEditOption ==
+Let me edit the lock rule
+
+== AddLockRuleLearnMore ==
+Click here to learn how to configure lock rules
+
+== AddLockRuleLearnMoreUrl ==
+https://www.plasticscm.com/download/help/locking
+
+== AddLockRuleEmptyRuleMessage ==
+The lock rule can not be empty.
+
+== UnsupportedServerOperation ==
+The server doesn't support this operation. Please upgrade the server to version {0} or greater.
+
+== KnownServersListRetrievingCloudOrgsProgress ==
+Retrieving Cloud organizations...
+
+== EditCommentButton ==
+Edit comment
+
+== DiffChangedWithCommentDirty ==
+You have edited the comment, do you want to save the changes?
+
+== ReviewOfChangesetTitle ==
+Review of changeset {0}
+
+== ReviewOfBranchTitle ==
+Review of branch {0}
+
+== Title ==
+Title
+
+== ReviewStatus ==
+Status
+
+== Reworkrequired ==
+Rework required
+
+== UnderReview ==
+Under review
+
+== Reviewed ==
+Reviewed
+
+== Reviewer ==
+Reviewer
+
+== ChangeButton ==
+Change
+
+== ReviewCommentsLabel ==
+Comments for line {0}
+
+== NoReviewCommentsToShow ==
+Click an icon on the right side of the diff to see the review comment for a given line
+
+== NoReviewCommentsForSelectedFile ==
+There are no review comments for the selected file
+
+== NoReviewComments ==
+Click the '+' sign on the right side of the diff to create a new comment for a given line
+
+== NoReviewCommentsSupportedXlinkedRepo ==
+Review comments for Xlinks are not supported yet
+
+== NoReviewCommentsSupportedDifferentRepos ==
+Review comments for xlinked files are not supported yet
+
+== NoReviewCommentsSupportedUnsupportedFileType ==
+Review comments for this file type are not supported yet
+
+== DirtyCodeReviewTitleTitle ==
+Save code review title
+
+== DirtyCodeReviewTitleQuestion ==
+You have edited the title, do you want to save the changes?
+
+== DirtyReviewCommentTitle ==
+Save review comment
+
+== DirtyReviewCommentQuestion ==
+You have edited the review comment, do you want to save the changes?
+
+== DirtyCommentQuestion ==
+You have edited the comment, do you want to save the changes?
+
+== NullRepSpec ==
+The repository information required to calculate the differences is missing.
+Please report this case to support to get it fixed.
+
+== CommentsLabelSingular ==
+Comment
+
+== CommentsLabelPlural ==
+Comments
+
+== ChangesLabelSingular ==
+Change
+
+== ChangesLabelPlural ==
+Changes
+
+== ChangeColumn ==
+Change requested
+
+== RevisionWithComments ==
+Revision with comments
+
+== LastInBranch ==
+Last in branch
+
+== DiffWithHead ==
+Diff with head
+
+== ThisFileHasNewChangesInTheBranch ==
+This file has new changes in the branch
+
+== ThisFileHasNewChangesInTheBranchExplanation ==
+You are diffing the revision where the comments were entered. But there are new changes. You can diff the original revision, the newest in the branch or the changes between the two.
+
+== AskQuestionButton ==
+Ask a question
+
+== AskQuestionButtonToolTip ==
+When you need an answer before approving
+
+== RequestChangeButton ==
+Request a change
+
+== RequestChangeButtonToolTip ==
+When you need the author to change something before approving
+
+== CopyCommentId ==
+Copy comment ID to clipboard
+
+== ChangeStatusDone ==
+Done
+
+== ChangeStatusPending ==
+Pending
+
+== ChangeStatusDiscarded ==
+Discarded
+
+== QuestionsLabelSingular ==
+Question
+
+== QuestionsLabelPlural ==
+Questions
+
+== QuestionColumn ==
+Question
+
+== AnswerColumn ==
+Answer
+
+== ExploreChangesetsPanelWaitingAnimation ==
+Loading changesets...
+
+== ChangesetReview ==
+Changeset review
+
+== ReviewEntireBranch ==
+Review entire branch
+
+== ReviewChangesetByChangeset ==
+Review changeset by changeset
+
+== UpdateStatusTitle ==
+Confirm status update
+
+== UpdateStatusPendingChangesSingular ==
+You have 1 change to apply.
+
+== UpdateStatusPendingChangesPlural ==
+You have {0} changes to apply.
+
+== UpdateStatusPendingQuestionsSingular ==
+You have 1 question to answer.
+
+== UpdateStatusPendingQuestionsPlural ==
+You have {0} questions to answer.
+
+== UpdateStatusPendingChangeAndQuestion ==
+You have 1 change to apply and 1 question to answer.
+
+== UpdateStatusPendingChangesAndQuestion ==
+You have {0} changes to apply and 1 question to answer.
+
+== UpdateStatusPendingChangeAndQuestions ==
+You have 1 change to apply and {0} questions to answer.
+
+== UpdateStatusPendingChangesAndQuestions ==
+You have {0} changes to apply and {1} questions to answer.
+
+== UpdateStatusQuestion ==
+You should not mark as reviewed a code review with pending comments. Continue anyway?
+
+== SinceOneWeekAgo ==
+1 week ago
+
+== SinceFifteenDaysAgo ==
+15 days ago
+
+== SinceOneMonthAgo ==
+1 month ago
+
+== SinceThreeMonthsAgo ==
+3 months ago
+
+== SinceAGivenDate ==
+A given date
+
+== CloseChangeRequestedInReview ==
+Close change requested in review
+
+== CollapseReviewCommentsTooltip ==
+Collapse review comments
+
+== ExpandReviewCommentsTooltip ==
+Expand review comments
+
+== CollapseCommentsSummaryTooltip ==
+Collapse comments summary
+
+== ExpandCommentsSummaryTooltip ==
+Expand comments summary
+
+== ReviewCommentsSummaryTitle ==
+Review comments summary
+
+== EmptyChangeList ==
+The list of changes is empty
+
+== EmptyQuestionList ==
+The list of questions is empty
+
+== MergeFileChangesInConflictSingular ==
+File changes in conflict, might require manual intervention (1 item)
+
+== MergeFileChangesInConflictPlural ==
+File changes in conflict, might require manual intervention ({0} items)
+
+== FileConflictsExplanation ==
+File changes in conflict, might require manual intervention.
+
+== FileConflictsExplanationForIncomingView ==
+Files to download that are in conflict with your changes.
+
+== ChangesWithDirectoryConflictsSingular ==
+Changes with directory structure conflicts (1 item)
+
+== ChangesWithDirectoryConflictsPlural ==
+Changes with directory structure conflicts ({0} items)
+
+== MergeFileChangesInConflictForIncomingViewSingular ==
+Files to download that are in conflict with your changes (1 item)
+
+== MergeFileChangesInConflictForIncomingViewPlural ==
+Files to download that are in conflict with your changes ({0} items)
+
+== MergeFileChangesInConflictForGluonSingular ==
+Files to download that are in conflict with your changes ({0} of 1 item)
+
+== MergeFileChangesInConflictForGluonPlural ==
+Files to download that are in conflict with your changes ({0} of {1} items)
+
+== MergeFileChangesInConflictRemark ==
+Changes in both source and destination contributors
+
+== MergeFileChangesInConflictRemarkForIncomingView ==
+Requires merge
+
+== MergeChangesMadeInSourceOfMergeSingular ==
+Changes made in the source of the merge. No conflicts (1 item)
+
+== MergeChangesMadeInSourceOfMergePlural ==
+Changes made in the source of the merge. No conflicts ({0} items)
+
+== MergeChangesMadeInSourceOfMergeForIncomingViewSingular ==
+Files that just need update (1 item)
+
+== MergeChangesMadeInSourceOfMergeForIncomingViewPlural ==
+Files that just need update ({0} items)
+
+== MergeChangesMadeInSourceOfMergeForGluonSingular ==
+Files that just need update ({0} of 1 item)
+
+== MergeChangesMadeInSourceOfMergeForGluonPlural ==
+Files that just need update ({0} of {1} items)
+
+== MergeMovesToApplySingular ==
+Moves to apply (1 item)
+
+== MergeMovesToApplyPlural ==
+Moves to apply ({0} items)
+
+== MergeMovesToApplyForGluonSingular ==
+Moves to apply ({0} of 1 item)
+
+== MergeMovesToApplyForGluonPlural ==
+Moves to apply ({0} of {1} items)
+
+== MergeMovesToApplyRemark ==
+Moved on source to {0}
+
+== MergeMovesToApplyRemarkForIncomingView ==
+Will apply the move to your workspace
+
+== MergeDeletesToApplySingular ==
+Deletes to apply (1 item)
+
+== MergeDeletesToApplyPlural ==
+Deletes to apply ({0} items)
+
+== MergeDeletesToApplyForGluonSingular ==
+Deletes to apply ({0} of 1 item)
+
+== MergeDeletesToApplyForGluonPlural ==
+Deletes to apply ({0} of {1} items)
+
+== MergeDeletesToApplyRemark ==
+Deleted on source
+
+== MergeDeletesToApplyRemarkForIncomingView ==
+Will apply the delete to your workspace
+
+== MergeNewItemsToDownloadSingular ==
+New items to download (1 item)
+
+== MergeNewItemsToDownloadPlural ==
+New items to download ({0} items)
+
+== MergeNewItemsToDownloadForGluonSingular ==
+New items to download ({0} of 1 item)
+
+== MergeNewItemsToDownloadForGluonPlural ==
+New items to download ({0} of {1} items)
+
+== MergeNewItemsToDownloadRemark ==
+Added on source
+
+== MergeNewItemsToDownloadRemarkForIncomingView ==
+Will apply the add to your workspace
+
+== MergeFileSystemPermissionsChangesToApplySingular ==
+Filesystem permissions changes to apply (1 item)
+
+== MergeFileSystemPermissionsChangesToApplyPlural ==
+Filesystem permissions changes to apply ({0} items)
+
+== MergeFileSystemPermissionsChangesToApplyRemark ==
+Changes in the filesystem permissions
+
+== MergeFileSystemPermissionsChangesToApplyRemarkForIncomingView ==
+Will apply the filesystem permissions change to your workspace
+
+== MergeFilesToDownloadCaptionSingular ==
+1 file to download ({0})
+
+== MergeFilesToDownloadCaptionPlural ==
+{0} files to download ({1})
+
+== MergeFilesToDeleteCaptionSingular ==
+1 file to delete ({0})
+
+== MergeFilesToDeleteCaptionPlural ==
+{0} files to delete ({1})
+
+== MergeToEnterCheckinComment ==
+Enter your checkin comment
+
+== MergeToEnterCheckinCommentExplanation ==
+Enter a checkin comment for the new changeset created by the merge-to.
+
+== IncomingChangesTitle ==
+Incoming changes from branch {0}
+
+== IncomingChangesCannotBeApplied ==
+Incoming changes that cannot be applied
+
+== ConfirmRecalculateMergeSingular ==
+You already resolved 1 directory conflict. Recalculate merge?
+
+== ConfirmRecalculateMergePlural ==
+You already resolved {0} directory conflicts. Recalculate merge?
+
+== ConfirmRecalculateMergeMessage ==
+If you continue, you will lose the chosen resolution for resolved conflicts. Then, you can choose them again.
+
+== RecalculateButton ==
+Recalculate
+
+== MergeProgressStatus ==
+Updated {0} of {1} ({2} of {3} files to download / {4} of {5} operations to apply)
+
+== MergeProgressDownloadingFile ==
+Downloading file {0} ({1})
+
+== MergeProgressDownloadingBlock ==
+Downloading block of {0} files ({1})
+
+== IncomingChangesAvailableSingular ==
+1 new changeset available
+
+== IncomingChangesAvailablePlural ==
+{0} new changesets available
+
+== IncomingChangesConflictsSingular ==
+1 new changeset - conflicts
+
+== IncomingChangesConflictsPlural ==
+{0} new changesets - conflicts
+
+== IncomingChangesAvailableForGluon ==
+new changes available
+
+== IncomingChangesConflictsForGluon ==
+new conflicting changes
+
+== UpdateButton ==
+Update
+
+== ViewButton ==
+View
+
+== DeleteRepositoryTitle ==
+Confirm repository deletion
+
+== UndeleteRepositoryTitle ==
+Confirm undelete the repository
+
+== DeleteRepositoryWarningText ==
+You are about to delete the repository '{0}'.
+
+== DeleteRepositoriesWarningText ==
+You are about to delete the following repositories:
+
+== DeleteMultipleRepositoriesWarningText ==
+You are about to delete multiple repositories
+
+== DeleteRepositoryConfirmText ==
+To confirm, type the name of the repository
+
+== DeleteRepositoriesConfirmText ==
+To confirm the delete, type '{0}'
+
+== DeleteRepositoryCannotUndo ==
+This action cannot be undone.
+
+== DeleteRepositoryConfirmEntry ==
+delete
+
+== UndeleteRepositoryConfirmText ==
+You are about to undelete the following repositories: {0}. Do you want to proceed?
+
+== IncomingChangesMenuItemMergeKeepingSourceChanges ==
+Merge keeping the incoming changes (head/source)
+
+== IncomingChangesMenuItemMergeKeepingWorkspaceChanges ==
+Merge keeping workspace changes (yours/destination)
+
+== IncomingChangesMenuItemDiffIncomingChanges ==
+Diff the incoming change (head/source)
+
+== IncomingChangesMenuItemDiffYoursWithIncoming ==
+Diff yours with incoming (head/source)
+
+== IncomingSymbolicName ==
+Incoming Changes
+
+== ParentRevisionSymbolicName ==
+Parent revision
+
+== WorkingChangesetMissing ==
+Working changeset is missing
+
+== WorkingChangesetDeletedTitle ==
+The working changeset was deleted
+
+== WorkingChangesetDeletedMessage ==
+The changeset you were working on was deleted.
+
+Your checkouts and local changes are not valid anymore.
+
+Do you want to go to the Pending Changes to undo your changes to return to a valid configuration?
+
+== IncomingChangesUpdateTooltip ==
+There are new changes in the branch that you can preview and download
+
+== IncomingChangesResolveTooltip ==
+There are files that are in conflict with your current changes
+
+== IncomingChangesWorkingChangesetMissingTooltip ==
+The changeset you were working on was deleted. Click the "Update" button to return to a valid configuration
+
+== UndoAllWorkingChangesetDeletedMessage ==
+Undoing your changes requires updating your workspace because the changeset you were working on was deleted.
+
+Do you want to continue?
+
+== PartialUndoWorkingChangesetDeletedMessage ==
+You need to undo all your changes because the changeset you were working on was deleted.
+
+Do you want to undo all your changes and update your workspace to a valid configuration?
+
+== OutOfDateIncomingChangesView ==
+This view is not valid anymore because the changeset you were working on was deleted.
+
+You need to update your workspace.
+
+== Warning ==
+Warning
+
+== IncomingChangesViewTitle ==
+Incoming changes
+
+== Reason ==
+Reason
+
+== LoadingCodeReviews ==
+Loading code reviews...
+
+== ReviewTitleColumn ==
+Title
+
+== ReviewStatusColumn ==
+Status
+
+== ReviewReviewerColumn ==
+Reviewer
+
+== MergingFile ==
+Merging file {0} of {1}: {2}
+
+== CodeReviewMenuItemOpen ==
+Open
+
+== CodeReviewMenuItemDelete ==
+Delete
+
+== DeletingCodeReview ==
+Deleting code review with title {0} ...
+
+== BranchMenuCreateANewCodeReview ==
+New code review for this branch...
+
+== ChangesetMenuCreateANewCodeReview ==
+New code review for this changeset...
+
+== CreatingCodeReview ==
+Creating code review with title {0} ...
+
+== ObtainingCodeReviewInfo ==
+Loading code review with title {0} ...
+
+== UpgradeServerForNewCodeReviewError ==
+You need to upgrade the server to version 8.0.16.3691 or higher to use the new code review system!
+
+== LoadingMembers ==
+Loading members...
+
+== UserChooserDialogTitle ==
+Please select a user or group from the list below:
+
+== NoUserSelectedErrorMessage ==
+Select a user from the list
+
+== UserNotFoundErrorMessage ==
+Could not find any user or group with name '{0}'
+
+== UserSizeLimitExceededErrorMessage ==
+The authentication server has exceeded the maximum limit of entries for a single query. Use the search filter to retrieve fewer entries (click the refresh button to trigger the retrieval).
+
+== CodeReviewOlderRevisionsNotSupported ==
+The code review comment you selected was created in an older revision of the item. This means that someone changed the commented item after the comment was created. The new Code Review system is still in a beta stage, so unfortunately we can't show you the comment in its original context.
+
+== CodeReviewInBetaWarningText ==
+Code reviews are still beta - check restrictions here.
+
+== CodeReviewInBetaWarningLink ==
+https://plasticscm.com/download/help/code-review-restrictions
+
+== CodeReviewInBetaWarningLinkedText ==
+here
+
+== CreateRepositoryDialogDetailedExplanation ==
+A repository stores the entire history of a particular directory tree, including all the revisions of its files and directories, revision labels, merge links, and other metadata.
+
+== CheckClearAll ==
+Check/clear all
+
+== MergeToMenuItemMergeKeepingDestinationChanges ==
+Merge keeping destination changes
+
+== MergeToMenuItemPreserveDestinationChanges ==
+Preserve destination changes
+
+== MergeToMenuItemMergeKeepingSourceChanges ==
+Merge keeping source changes
+
+== MergeToMenuItemPreserveSourceChanges ==
+Preserve source changes
+
+== DetailsColumn ==
+Details
+
+== AuthorColumn ==
+Author
+
+== PrivacyStatementText ==
+Controller: Codice Software, S.L. Purposes of the processing: Create your account and provide the requested services. You may exercise your rights of access, rectification, erasure and other data protection rights as described in our Privacy Statement. For additional information, please see our {0}
+
+== PrivacyStatement ==
+Privacy Statement
+
+== SignUpWithUnity ==
+Sign up with Unity. Check this to use your Unity ID and password.
+
+== GitSyncDialogTitle ==
+Plastic SCM synchronization with Git
+
+== GitSyncDialogExplanation ==
+Synchronize repository '{0}'
+
+== GitSyncDialogDetailedExplanation ==
+It will sync the required changesets between the Plastic SCM and Git repositories
+
+== SyncButton ==
+Sync
+
+== PlasticRepository ==
+Plastic SCM repository:
+
+== GitRepositoryUrl ==
+Git repository URL:
+
+== GitRepositoryCannotBeEmpty ==
+The repository URL field cannot be empty.
+
+== LoadingStoredGitUrls ==
+Loading stored Git URLs for repository '{0}'
+
+== SyncStatusPullRepository ==
+Pulling "{0}" from {1}
+
+== SyncStatusPushRepository ==
+Pushing "{0}" to {1}
+
+== SyncStatusSyncRepository ==
+Synchronizing "{0}" with {1}
+
+== SyncStatusConflict ==
+Warning: there are branches that were modified concurrently on both Git and Plastic SCM sides.
+These conflicts are handled as a "subbranch" in Plastic SCM, and they'll need to be merged.
+To be able to sync again, you need to solve the conflicts in these branches first.
+
+== SyncPhaseUpgradingMappings ==
+Upgrading mappings
+
+== SyncPhaseReceivingReferences ==
+Receiving references
+
+== SyncPhaseSyncType ==
+Compressing objects
+
+== SyncPhaseCompressing ==
+Compressing
+
+== SyncPhaseDownloading ==
+Downloading
+
+== SyncPhaseProcessing ==
+Processing
+
+== SyncPhaseImporting ==
+Importing
+
+== SyncPhaseExporting ==
+Exporting
+
+== SyncPhasePackaging ==
+Packaging
+
+== SyncPhaseUploading ==
+Sending
+
+== SyncPhaseCompleted ==
+Completed
+
+== Users ==
+Users
+
+== Groups ==
+Groups
+
+== Both ==
+Both
+
+== SelectedUserOrGroup ==
+Selected user or group:
+
+== User ==
+User
+
+== Group ==
+Group
+
+== SpecialUser ==
+Special user
+
+== SpecialGroup ==
+Special group
+
+== AddButton ==
+Add...
+
+== RemoveButton ==
+Remove
+
+== AllowAll ==
+Allow All
+
+== DenyAll ==
+Deny All
+
+== RepositoryServerPermissions ==
+Repository server permissions
+
+== PermissionsFor ==
+Permissions for {0}
+
+== ConfigureObjectPermissions ==
+Configure object permissions
+
+== PermissionsColumn ==
+Permissions
+
+== AllowedColumn ==
+Allowed
+
+== DeniedColumn ==
+Denied
+
+== SecurityRepserverEntriesCannotBeEmpty ==
+The repository server must have permissions defined for at least one valid user or group.
+Please set permissions for one of them and try again.
+
+== PermissionsCantRemoveInheritedSeid ==
+Cannot remove an inherited entry
+
+== MsgAllowDeny ==
+The denied permission will override the Allowed permission
+
+== ChangeOwner ==
+Change...
+
+== UsersAndGroups ==
+Users and groups
+
+== PermissionsMenuItem ==
+Permissions
+
+== Override ==
+override
+
+== OverrideHelp ==
+Permissions can be overridden to bypass inheritance. Mark as overriden, then set the new value.
+
+== DeleteBranchGroup ==
+Delete group of branches
+
+== DeleteSelectedBranchGroup ==
+You are going to delete the selected group of branches.
+
+== ContinueQuestion ==
+Do you want to continue?
+
+== PathPermissions ==
+Path permissions
+
+== DeleteSecuredPath ==
+Delete path
+
+== DeleteSelectedSecuredPath ==
+You are going to delete the selected path.
+
+== AllBranches ==
+All branches
+
+== NewBranchGroupTitle ==
+Select branches
+
+== NewBranchGroupExplanation ==
+Select the branches where the new path permissions will be applied
+
+== NewBranchGroupLabel ==
+Type the branches
+
+== AllBranchesRadioButton ==
+All branches
+
+== BranchesRadioButton ==
+Branches:
+
+== NewBranchGroupIdentificationTag ==
+Type an identification tag for the branches group:
+
+== NoBranchSelected ==
+No branch selected
+
+== EditBranchGroupLabel ==
+Edit branch group
+
+== EditBranchGroupExplanation ==
+Add or remove branches from the branch group
+
+== PathPermissionFormExplanation ==
+Configure secured path permissions. Note that these permissions will be merged with the corresponding branch and parent paths.
+
+== RetrievingRepositoryServerInfoProgress ==
+Retrieving repository server info...
+
+== CalculatingPermissionsInfo == 
+Calculating permissions info...
+
+== RetrievingSecuredPathsProgress ==
+Retrieving secured paths...
+
+== RetrievingAllSecuredPathsProgress ==
+Retrieving all secured paths...
+
+== NewSecuredPathTitle ==
+Create new secured path
+
+== NewSecuredPathExplanation ==
+Create new secured path where you can define path permissions
+
+== NewSecuredPathLabel ==
+Please type a path
+
+== DefineBranchesCheckBox ==
+Configure branches after creating path
+
+== PartialWorkspaceStripLabel ==
+The workspace is in partial mode. [[UpdateWorkspace|Run an update]] (get latest) to switch to full mode. This GUI does not work well in partial mode
+
+== FullWorkspaceStripLabel ==
+The workspace is in full mode. [[UpdateWorkspace|Run an update]] (get latest) to switch to partial mode. This GUI does not work well in full mode
+
+== RemainingProgressMessage ==
+remaining
+
+== DiffLinkButtonTooltip ==
+Copy link to share diffs
+
+== MainWindowTitleForLinux ==
+Plastic SCM - wk: {0}
+
+== GluonFilePlasticLinkText ==
+Get link - copy a link to this file so you can easily share it with others
+
+== FileAlreadyExists ==
+File {0} already exists.
+
+== DirectoryAlreadyExists ==
+Directory {0} already exists.
+
+== OAuthSignInCheckMessage ==
+Waiting for a session...
+
+== RetrievingOrgsProgress ==
+Retrieving organizations...
+
+== GettingSSOProviders ==
+Getting organization providers...
+
+== WaitingForSession ==
+Waiting for a session
+
+== CompleteSignInOnBrowser ==
+Complete your sign in using your Browser.
+
+== Or ==
+or
+
+== OrganizationNameWatermark ==
+Your organization name
+
+== SSOSignInTitle ==
+Sign in with Single Sign On
+
+== SignInToOrganization ==
+Sign in to {0}
+
+== NoProvidersForOrganization ==
+The specified organization doesn't allow access with SSO
+
+== DontKnowOrganizationName ==
+I don't know the organization name
+
+== KnowOrganizationName ==
+I know the organization name
+
+== CompanyEmail ==
+Company Email
+
+== SignInWithSingleSignOn ==
+Sign in with Single Sign On
+
+== SentEmailStatementText ==
+We've sent an email to {0} with the organizations you belong. Check it and then, sign in using your {1}
+
+== OrganizationNameStatementText ==
+organization name.
+
+== SendingEmail ==
+Sending email...
+
+== EmailNotSent ==
+The email couldn't be sent
+
+== SignInTo ==
+Sign in to {0}
+
+== ConnectToServer ==
+Connect to {0}
+
+== SignedInAs ==
+Signed in as {0}
+
+== SignInWasNotCompleted ==
+Sign in was not completed
+
+== OnDemandConnectionTypeHelp ==
+On demand: Use this option when the Plastic SCM server is not always reachable from this client and Plastic SCM will not try to connect to it unless explicitly told so.
+
+== AutomaticConnectionTypeHelp ==
+Automatic: Use this option when the server is always online (maybe on the same local network, when connecting from a desktop machine).
+
+== SignOut ==
+Sign Out
+
+== FastEnough ==
+Fast enough!
+
+== NotBad ==
+This is not bad.
+
+== TooMuch ==
+This is too much.
+
+== ErrorAddPlasticSCMMenuItem ==
+Cannot add PlasticSCM menu item: {0} Method Menu.AddSubMenu not found
+
+== ErrorRemovePlasticSCMMenuItem ==
+Cannot remove PlasticSCM menu item: {0} Method MenuType.RemoveMenuItem not found
+
+== ErrorUpdatePlasticSCMMenus ==
+Cannot update all menus: Method EditorUtility.Internal_UpdateAllMenus not found
+
+== ErrorPlasticSCM ==
+Error - Plastic SCM
+
+== CheckoutButton ==
+Checkout
+
+== UpdateResultsError ==
+Some items were not correctly updated. You may want to check the errors and retry the operation after solving the problems
+
+== PluginModalInformation ==
+The modal dialog is not available in this version and it is required for the Plastic SCM plugin works fine. \n Please contact support@codicesoftware.com for further info.
+
+== ChangesetsCount ==
+{0} changesets
+
+== HideChanges ==
+Hide changes
+
+== ShowChanges ==
+Show changes
+
+== ChooseRepositoryTitle ==
+Choose repository
+
+== ExploreRepositories ==
+Explore repositories
+
+== WorkspacesExplanationLabel ==
+Workspaces are used to store the local copies of your project files that you can checkin to a repository.
+
+== RepositoryName ==
+Repository Name
+
+== RepositoryNameShortLabel ==
+Repository Name:
+
+== NewButton ==
+New
+
+== WorkPreferenceQuestion ==
+How do you prefer to work?
+
+== WorkPreferenceAnswerPlastic ==
+I need branching, merging and the ability to push/pull (Plastic workspace)
+
+== WorkPreferenceAnswerGluon ==
+I simply need to checkin my work (Gluon workspace)
+
+== CreateWorkspace ==
+Create workspace
+
+== LearnMoreDifferences ==
+Learn more about the differences between Plastic/Gluon workspaces <color=\"{0}\">{1}</color>
+
+== HereLink ==
+here.
+
+== PlasticSCMFullVsPartialWorkspaceLink ==
+https://www.plasticscm.com/book/#_full_workspaces_vs_partial_workspaces
+
+== SelectPathToRestore ==
+Select path to restore
+
+== SkipRestoreButton ==
+Skip
+
+== ChangesOfChangeset ==
+Changes of changeset {0}
+
+== UndoThisChangePlusMeta ==
+Undo this change +meta
+
+== UndoSelectedChanges ==
+Undo selected changes
+
+== UndoThisChange ==
+Undo this change
+
+== UndeleteRevisionPlusMeta ==
+Undelete revision +meta
+
+== UndeleteSelectedRevisions ==
+Undelete selected revisions
+
+== UndeleteRevisions ==
+Undelete revision
+
+== UndeleteRevisionPlusMetaPath ==
+Undelete revision +meta to specified path...
+
+== UndeleteSelectedRevisionsPaths ==
+Undelete selected revisions to specified paths...
+
+== UndeleteRevisionPath ==
+Undelete revision to specified path...
+
+== DiffMenuItem ==
+Diff
+
+== DiffMetaMenuItem ==
+Diff .meta
+
+== ViewHistoryMenuItem ==
+View file history
+
+== ViewHistoryMetaMenuItem ==
+View .meta file history
+
+== SolveConflictsInLable ==
+Solve conflicts in the directory structure first
+
+== PleaseComment ==
+Please comment on your checkin
+
+== CheckinHeader ==
+Checkin {0} of {1} item(s)
+
+== OpenMeta ==
+Open .meta
+
+== OpenMetaWith ==
+Open .meta with...
+
+== OpenMetaInExplorer ==
+Open .meta in explorer
+
+== DownloadingProgress ==
+Downloading
+
+== ConnectingError ==
+There was an error connecting. Please check your internet.
+
+== InstallingProgress ==
+Installing...
+
+== SkippingDownloadFileExists ==
+Skipping download. File {0} already exists
+
+== InstallPlasticSCM ==
+Install Plastic SCM
+
+== LoginOrSignUp ==
+Login or sign up
+
+== CreateAPlasticWorkspace ==
+ Create a Plastic workspace for this project
+
+== NextStepsToSetup ==
+ Next steps to complete setup
+
+== DownloadAndInstall ==
+ Download and install Plastic SCM (about 190MB)
+
+== LoginOrSignUpPlastic ==
+ Login or sign up for a Plastic account
+
+== WhichVersionInstall ==
+Which version do you want to install?
+
+* Cloud Edition is intended for for teams who usually work with a Cloud server.
+* Enterprise Edition is the choice for teams who work with on-premise servers.
+
+== PlasticSCM ==
+Plastic SCM
+
+== DownloadCloudEdition ==
+Download Cloud Edition
+
+== DownloadEnterpriseEdition ==
+Download Enterprise Edition
+
+== PrefixPlasticMenu ==
+Assets/Plastic SCM
+
+== PendingChangesPlasticMenu ==
+Show pending changes view
+
+== AddPlasticMenu ==
+Add to source control
+
+== CheckoutPlasticMenu ==
+Checkout
+
+== CheckinPlasticMenu ==
+Checkin
+
+== UndoPlasticMenu ==
+Undo changes
+
+== DiffPlasticMenu ==
+Diff with previous revision
+
+== HistoryPlasticMenu ==
+View file history
+
+== StatusCheckout ==
+Checked out
+
+== StatusConflicted ==
+Conflicted
+
+== StatusLockedMe ==
+Locked by me
+
+== StatusLockedRemote ==
+Locked remote
+
+== AssetOverlayTooltipStatus ==
+{0} by:
+
+== AssetOverlayTooltipWorkspace ==
+workspace {0}
+
+== SignUpUnityID ==
+Sign up with Unity ID
+
+== SignUpGoogle ==
+Sign up with Google
+
+== CannotAddVersionControl ==
+Cannot add files to Version Control: {0}
+
+== CannotDeleteVersionControl ==
+Cannot delete '{0}' in Version Control: {1}
+
+== CannotMoveVersionControl ==
+Cannot move '{0}' to '{1}' in Version Control: {2}
+
+== CannotCheckoutVersionControl ==
+Cannot checkout files in Version Control: {0}
+
+== ErrorGettingCredentialsCloudProject ==
+Error getting credentials to download Cloud Project: {0} ({1})
+
+== ErrorDownloadingCloudProject ==
+Error downloading Cloud Project: {0}
+
+== RuntimeVersionErrorFilesystemWatcher ==
+Plastic SCM: Detected an unsupported Runtime Version. The Plastic SCM Filesystem Watcher is not compatible with this runtime, and has been disabled.This can affect to the Pending Changes view performance, and also causes that the auto - refresh feature for views is disabled. We strongly recommend upgrading to the.NET 4.x equivalent Runtime Version for a better experience. In order to change the Runtime Version go Edit > Project Settings > Player > Other Settings > Configuration > Scripting Runtime Version.
+
+== ConfigureGluon ==
+Configure Gluon
+
+== LaunchBranchExplorer ==
+Launch branch explorer
+
+== LaunchPlasticButton ==
+Launch Plastic
+
+== CannotWriteCloudProjectId ==
+Cannot write cloudProjectId: Method PlayerSettings.SetCloudProjectId not found
+
+== PlasticConfigurationTitle ==
+Configure the connection to the Plastic SCM server
+
+== PlasticConfigurationExplanation ==
+Enter the server name or IP and the credentials
+
+== UnityDiffShortcut ==
+%d
+
+== UnityAssetDiffShortcut ==
+#%d
+
+== UnityHistoryShortcutForWindows ==
+%h
+
+== UnityHistoryShortcutForMacOS ==
+#%h
+
+== UnityDeleteShortcutForWindows ==
+_Del
+
+== UnityDeleteShortcutForMacOS ==
+%Del
+
+== UnityOpenShortcut ==
+#o
+
+== CheckingInFilesProgress ==
+Checking in files...
+
+== Files ==
+Files
+
+== UnityCheckinConflictsExplanation ==
+Some files you're trying to checkin are in conflict. You can resolve conflicts using the Incoming Changes view.
+
+== CheckinShowIncomingChangesView ==
+Show incoming changes view
+
+== UnityInitialCheckinComment ==
+Add packages and project settings to Plastic SCM.
+
+== UnityInitialCheckinProgress ==
+Checking in the packages and project settings files...
+
+== Default ==
+Default
+
+== FileMerge ==
+File Merge
+
+== KDiff3 ==
+KDiff3
+
+== SemanticMerge ==
+Semantic Merge
+
+== UnitySmartMerge ==
+Unity Smart Merge
+
+== Custom ==
+Custom
+
+== NotCloudRepository ==
+The selected repository must be a cloud repository
+
+== DisableAllHelpTips ==
+Disable all tips
diff --git a/Lib/Editor/PlasticSCM/localization/plastic-gui.en.txt.meta b/Lib/Editor/PlasticSCM/localization/plastic-gui.en.txt.meta
new file mode 100644
index 0000000..8d3500c
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/localization/plastic-gui.en.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6f6686652369c3044877b9c9ffa5ed2d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/localization/plastic-gui.es.txt b/Lib/Editor/PlasticSCM/localization/plastic-gui.es.txt
new file mode 100644
index 0000000..59d9a41
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/localization/plastic-gui.es.txt
@@ -0,0 +1,6825 @@
+== Branch ==
+Branch
+
+== Changeset ==
+Changeset
+
+== ChangesetLowercase ==
+changeset
+
+== ChangesetsLowercase ==
+changesets
+
+== Label ==
+Label
+
+== Server ==
+Server
+
+== Workspace ==
+Workspace
+
+== Repository ==
+Repository
+
+== Checkin ==
+Checkin
+
+== UndoChanges ==
+Undo Changes
+
+== UpdateWorkspace ==
+Update workspace
+
+== UpdateWorkspaceAmp ==
+&Update workspace
+
+== ItemsMenuUndoCheckout ==
+Undo checkout
+
+== ItemsMenuUndoChanges ==
+Undo changes
+
+== ItemsMenuChangeRevType ==
+Change revision type
+
+== MenuItemExternalTools ==
+External tools
+
+== ItemNameEmpty ==
+The name cannot be empty
+
+== ItemExists ==
+The item {0} already exists
+
+== MovingItems ==
+Moving items...
+
+== Options ==
+Options
+
+== OptionsAmp ==
+&Options
+
+== BranchExplorerOptionsTooltip ==
+Show the options panel
+
+== BranchExplorerOptionsToggleTooltip ==
+Hide or show the options panel
+
+== GoButton ==
+Go
+
+== GoToBranchBase ==
+Go to branch base
+
+== BranchExplorerMenu ==
+Branch Explorer
+
+== FilterSelectedBranches ==
+Filter selected branches
+
+== FilterSelectedAndRelatedBranches ==
+Filter selected and related branches
+
+== FilterSelectedBranchesPendingMerges ==
+Filter pending merges for selected branches
+
+== GoToParentChangeset ==
+Go to parent changeset
+
+== AddInclusion ==
+Add inclusion
+
+== AddExclusion ==
+Add exclusion
+
+== CustomBranchQuery ==
+Custom branch query rule
+
+== CustomChangesetQuery ==
+Custom changeset query rule
+
+== CustomLabelQuery ==
+Custom label query rule
+
+== ConditionalBranchFormatText ==
+Nuevo formato condicional de ramas (para destacar)
+
+== ConditionalChangesetFormatText ==
+Nuevo formato condicional de changesets (para destacar)
+
+== ConditionalLabelFormatText ==
+Nuevo formato condicional de etiquetas (para destacar)
+
+== InclusionRuleText ==
+New inclusion branch filter (branches to be included)
+
+== ExclusionRuleText ==
+New exclusion branch filter (branches to be excluded)
+
+== ActiveBranch ==
+Active branch in the workspace
+
+== ActiveBranches ==
+Active branches in the workspace
+
+== BranchesWithPendingIntegrations ==
+Branches with pending merges
+
+== AddFormat ==
+Add format
+
+== Calculating ==
+Calculating...
+
+== CopyrightTextFormat ==
+Copyright © 2006-{0} Codice Software S.L. All Rights Reserved.
+
+== FiltersAndConditionalFormat ==
+Filters & format
+
+== VisitUsText ==
+Visit us at
+
+== MeetUsText ==
+Meet us at
+
+== ReleaseText ==
+Release:
+
+== ReleaseNotesLinkText ==
+Release notes
+
+== WebsiteLink ==
+https://www.plasticscm.com
+
+== MeetUsLink ==
+https://www.plasticscm.com/company/team
+
+== ReleaseNotesUrlPreffix ==
+https://www.plasticscm.com/download/releasenotes/
+
+== DesignedInText ==
+Designed in Boecillo Park (Valladolid), Spain
+
+== RevertStart ==
+Reverting the revision in the workspace...
+
+== RevertingItemsSingular ==
+Reverting 1 item...
+
+== RevertingItemsPlural ==
+Reverting {0} items...
+
+== RevertingProgress ==
+Reverting file {0} of {1}: {2}
+
+== Validating ==
+Validating data...
+
+== UpdateReportNoLinesSelected ==
+Please select the paths you want to update
+
+== UpdateProgressCalculating ==
+Calculando...
+
+== UpdateProgressUpdating ==
+Actualizando...
+
+== UpdateProgressSingular ==
+Actualizados {0} de {1} ({2} de 1 fichero){4}
+
+== UpdateProgressPlural ==
+Actualizados {0} de {1} ({2} de {3} ficheros){4}
+
+== CheckinComments ==
+Checkin comments
+
+== UpdatingSelectedItems ==
+Updating the selected items...
+
+== LoadingItems ==
+Loading items...
+
+== LoadingBranches ==
+Loading branches...
+
+== LoadingBranchExplorer ==
+Loading Branch Explorer...
+
+== LoadingLabels ==
+Loading labels...
+
+== LoadingChangesets ==
+Loading changesets...
+
+== LoadingShelves ==
+Loading shelves...
+
+== LoadingSyncViewDetails ==
+Loading sync view details...
+
+== LoadingDeletedItems ==
+Loading deleted items...
+
+== UncheckoutStart ==
+Unchecking out selected items...
+
+== ActionMenuButtonTooltip ==
+Perform actions with the selected item
+
+== MainSidebarMainActionsItem ==
+Main Actions
+
+== MainSidebarItemsItem ==
+Workspace Explorer
+
+== MainSidebarPendingChangesItem ==
+Pending Changes
+
+== MainSidebarCheckinItem ==
+Checkin
+
+== MainSidebarBranchesItem ==
+Branches
+
+== MainSidebarBranchExplorerItem ==
+Branch Explorer
+
+== MainSidebarChangesetsItem ==
+Changesets
+
+== MainSidebarLabelsItem ==
+Labels
+
+== MainSidebarAttributesItem ==
+Atributos
+
+== MainSidebarSyncItem ==
+Sync Repositories
+
+== MainSidebarSyncItemCloudEdition ==
+Sync to Cloud
+
+== MainSidebarCloudItem ==
+Cloud
+
+== MainSidebarMergeItem ==
+Merge
+
+== MainSidebarIncomingChangesItem ==
+Incoming Changes
+
+== MainSidebarPreferencesItem ==
+Preferences
+
+== MainSidebarAboutItem ==
+About Plastic SCM
+
+== MainSidebarAboutGluonItem ==
+About Gluon
+
+== MainSidebarRepositoriesItem ==
+Repositories
+
+== MainSidebarWorkspacesItem ==
+Workspaces
+
+== MainSidebarCodeReviewsItem ==
+Revisiones de código
+
+== ItemColumn ==
+Item
+
+== StatusColumn ==
+Status
+
+== ExtensionColumn ==
+Extension
+
+== TypeColumn ==
+Type
+
+== DateModifiedColumn ==
+Date modified
+
+== RepositoryColumn ==
+Repository
+
+== ServerColumn ==
+Server
+
+== ObjectNameColumn ==
+Object name
+
+== NameColumn ==
+Name
+
+== PathColumn ==
+Path
+
+== ProblemColumn ==
+Problem
+
+== SeverityColumn ==
+Severity
+
+== TimestampColumn ==
+Time stamp
+
+== LastEditedByColumn ==
+Last edited by
+
+== CreationDateColumn ==
+Creation date
+
+== GuidColumn ==
+Guid
+
+== CommentColumn ==
+Comment
+
+== ChangedItemsSelectedSingular ==
+Changed items - {0} of 1 item selected
+
+== ChangedItemsSelectedPlural ==
+Changed items - {0} of {1} items selected
+
+== AddedPrivateItemsSelectedSingular ==
+Added and private - {0} of 1 item selected
+
+== AddedPrivateItemsSelectedPlural ==
+Added and private - {0} of {1} items selected
+
+== DeletedItemsSelectedSingular ==
+Deleted items - {0} of 1 item selected
+
+== DeletedItemsSelectedPlural ==
+Deleted items - {0} of {1} items selected
+
+== MovedItemsSelectedSingular ==
+Moved items - {0} of 1 item selected
+
+== MovedItemsSelectedPlural ==
+Moved items - {0} of {1} items selected
+
+== DeletingObjectsSingular ==
+Deleting 1 object
+
+== DeletingObjectsPlural ==
+Deleting {0} objects
+
+== DeleteObjectsSingular ==
+Deleting 1 object. Are you sure?
+
+== DeleteObjectsPlural ==
+Deleting {0} objects. Are you sure?
+
+== ConfirmDeletionTitle ==
+Confirm deletion
+
+== ConfirmRevertTitle ==
+Confirm revert
+
+== ConfirmRevertMessage ==
+Contents will be reverted to revision {0}. Continue?
+
+== ConfirmRevertToClientDiffsMessage ==
+The selected files will be reverted. Continue?
+
+== ConfirmUndeleteTitle ==
+Confirm undelete
+
+== ConfirmUndeleteMessage ==
+The selected files will be undeleted. Continue?
+
+== FromTo ==
+{0} to {1}
+
+== From ==
+from
+
+== To ==
+to
+
+== AddProgress ==
+Adding items...
+
+== CheckoutProgress ==
+Checking out items...
+
+== UndoingPendingChanges ==
+Undoing changes...
+
+== UndoingUnchanged ==
+Undoing unchanged items...
+
+== ShelvingPendingChanges ==
+Shelving changes...
+
+== UndoingChangedFiles ==
+Undoing changes...
+
+== UndoingChangedFilesError ==
+Some error has occurred during the undo changes operation:
+
+== New ==
+New...
+
+== ItemsMenuItemHistory ==
+History
+
+== ItemsMenuItemAnnotate ==
+Annotate
+
+== NoItemsAreSelected ==
+No items are selected. Use items' checkboxes to select them. This can also occur if you have selected items, but they are all ignored.
+
+== EmptyComments ==
+The comment field is empty. Don't forget to add a checkin comment before creating a new changeset.
+
+== RepositoryNameLabel ==
+Name of the new repository:
+
+== WorkspaceNameLabel ==
+Name of the new workspace:
+
+== NewRepositoryTitle ==
+Create a new repository
+
+== RenameRepositoryTitle ==
+Rename Repository
+
+== NewWorkspace ==
+Create a new workspace
+
+== RenameWorkspaceTitle ==
+Rename Workspace
+
+== NewWorkspaceNameLabel ==
+New name of the workspace:
+
+== RepositoryServerLabel ==
+Server (your_server:8087 or your_org@cloud):
+
+== WorkspacePathLabel ==
+Path on disk:
+
+== RepositoryLabel ==
+Repository:
+
+== BrowseLabel ==
+Browse...
+
+== LocalChangesApplierProgressProcessingNeededPaths ==
+Processing needed paths
+
+== CheckinAutoUpdateMergeRequest ==
+New files in the branch, update needed.
+
+== CheckinAutoUpdateMergeRequestMessage ==
+New changes appeared on the branch you are working on since you started your own changes in the workspace. You need to get those changes to your workspace before checking in yours.
+      
+Since the changes in the branch don't conflict with your changes in the workspace, you can simply update the workspace before checking in. 
+      
+Do you want to update the workspace and checkin your changes now?
+
+== UpdateWorkspaceMergeRequest ==
+Conflicts detected before updating
+
+== UpdateWorkspaceMergeRequestMessage ==
+Some files you have changed in your workspace were modified as well in the branch and you need to merge them before continuing. 
+
+A merge view will open so that you can merge the items with conflicts. Please resolve them and then proceed with the update.
+
+== CheckinMergeRequest ==
+Checkin on this branch cannot proceed. 
+
+== CheckinMergeRequestMessage ==
+Other changes have been checked in while you were making your changes.
+
+== CheckinMergeRequestQuestion ==
+A merge is needed in order to continue. How would you like to proceed?
+
+== CheckinMergeNow ==
+Merge now
+
+== RepositoryServerEmpty ==
+Repository server must not be empty
+
+== CouldNotGetOrganizationNameFromCredentials ==
+Invalid credentials. Couldn't get organization name
+
+== CouldNotGetOrganizationName == 
+Unable to get the organization name from the cloud server. Maybe your credentials are wrong. Please run again the configuration tool enter new credentials ('{0} --configure')
+
+== RepositoryServerIsNotAvailable ==
+The repository server is not available
+
+== RepositoryNameEmpty ==
+Repository name must not be empty
+
+== WorkspaceNameEmpty ==
+Workspace name must not be empty
+
+== WorkspacePathEmpty ==
+Workspace path must not be empty
+
+== WorkspacePathUnauthorizedAccess ==
+Unauthorized access to create the workspace on the specified path
+
+== InvalidCharsInPath ==
+Workspace path contains invalid characters
+
+== WorkspaceNameAlreadyExists ==
+The workspace {0} already exists
+
+== WorkspacePathAlreadyUsed ==
+The path {0} is already contained in a workspace
+
+== CheckinMergeNowMessage ==
+Stop the checkin. Show a dialog to merge the other changes with your changes. You can then proceed again with the original checkin.
+
+== CheckinMergeLater ==
+Merge later (checkin my changes in a child branch)
+
+== CheckinMergeLaterMessage ==
+Continue the checkin. Create a child branch of {0} and save your changes on that branch. Later you can merge the child branch back to current branch.
+
+== CheckinMergeBranch ==
+Name for child branch
+
+== RepositoryMenuItemCreate ==
+Create new repository...
+
+== RepositoryMenuItemCreateWorkspace ==
+Create workspace for this repository...
+
+== RenameMenuItem ==
+Rename
+
+== WorkspaceMenuItemOpen ==
+Open
+
+== WorkspaceMenuItemOpenAmp ==
+&Open
+
+== WorkspaceMenuItemOpenInNewWindow ==
+Open in a new window
+
+== WorkspaceMenuItemOpenInNewWindowAmp ==
+Open in a &new window
+
+== WorkspaceMenuItemOpenWith ==
+Open with...
+
+== OpenInExplorerMenuItem ==
+Open in explorer
+
+== DeleteMenuItem ==
+Delete
+
+== UndeleteMenuItem ==
+Undelete
+
+== WorkspaceMenuItemCreate ==
+Create a new workspace...
+
+== WorkspaceMenuItemCreateAmp ==
+&Create a new workspace...
+
+== WorkspaceMenuItemRename ==
+Rename
+
+== WorkspaceMenuItemRenameAmp ==
+Rena&me
+
+== WorkspaceMenuItemDelete ==
+Delete
+
+== WorkspaceMenuItemDeleteAmp ==
+&Delete
+
+== BranchMenuItemCreateBranch ==
+Create child branch...
+
+== BranchMenuItemMergeFromBranch ==
+Merge from this branch...
+
+== BranchMenuItemAdvancedMerge ==
+Advanced merge
+
+== BranchMenuItemCherrypickFromBranch ==
+Cherry pick from this branch...
+
+== BranchMenuItemMergeToFromBranch ==
+Merge from this branch to...
+
+== BranchMenuItemPushPull ==
+Push/Pull
+
+== BranchMenuItemPullBranch ==
+Pull this branch...
+
+== BranchMenuItemPullRemoteBranch ==
+Pull remote branch...
+
+== BranchMenuItemSyncWithGit ==
+Sincronizar con Git...
+
+== BranchMenuItemPushBranch ==
+Push this branch...
+
+== BranchMenuItemRenameBranch ==
+Rename...
+
+== BranchMenuItemDeleteBranch ==
+Delete
+
+== BranchMenuItemSwitchToBranch ==
+Switch workspace to this branch
+
+== BranchMenuItemDiff ==
+Diff branch
+
+== BranchMenuItemDiffWithAnotherBranch ==
+Diff with another branch...
+
+== BranchMenuItemViewChangesets ==
+View changesets on this branch
+
+== ChangesetMenuItemCreateBranch ==
+Create branch from this changeset...
+
+== ChangesetMenuChangesetDiff ==
+Diff changeset
+
+== ChangesetMenuItemDiff ==
+Diff with previous
+
+== ChangesetMenuItemDiffWithAnother ==
+Diff with another changeset...
+
+== ChangesetMenuItemDiffSelected ==
+Diff selected changesets
+
+== ChangesetMenuItemBrowseRepositoryOnChangeset ==
+Browse repository on this changeset
+
+== ChangesetMenuItemLabelChangeset ==
+Label this changeset...
+
+== ChangesetMenuItemSwitchToChangeset ==
+Switch workspace to this changeset
+
+== ChangesetMenuItemMergeFromChangeset ==
+Merge from this changeset...
+
+== ChangesetMenuItemCherrypickFromChangeset ==
+Cherry pick from this changeset...
+
+== ChangesetMenuItemAdvancedMerge ==
+Advanced merge
+
+== ChangesetMenuItemSubtractiveFromChangeset ==
+Subtractive merge from this changeset...
+
+== ChangesetMenuItemSubtractiveFromChangesetInterval ==
+Subtractive merge from this changeset interval...
+
+== ChangesetMenuItemCherrypickFromChangesetInterval ==
+Cherry pick from this changeset interval...
+
+== ChangesetMenuItemMergeToFromChangeset ==
+Merge from this changeset to...
+
+== ChangesetMenuItemAdvancedOptions ==
+Advanced options
+
+== ChangesetMenuItemMoveChangeset ==
+Move from this changeset to a different branch...
+
+== ChangesetMenuItemDeleteChangeset ==
+Delete changeset
+
+== CheckoutChangesetMenuItemShowPendingChangesView ==
+Show pending changes view
+
+== LabelMenuItemCreateLabel ==
+Create new label...
+
+== LabelMenuItemApplyLabelToWorkspace ==
+Apply label to workspace content
+
+== LabelMenuItemSwitchToLabel ==
+Switch workspace to this label
+
+== LabelMenuItemMergeFromLabel ==
+Merge from this label...
+
+== LabelMenuItemMergeToFromLabel ==
+Merge from this label to...
+
+== LabelMenuItemCreateBranchFromLabel ==
+Create branch from this label...
+
+== LabelMenuItemRenameLabel ==
+Rename...
+
+== LabelMenuItemDeleteLabel ==
+Delete
+
+== ShelveMenuItemViewShelve ==
+View shelve
+
+== ShelveMenuItemApplyShelveInWorkspace ==
+Apply shelve in my workspace...
+
+== ShelveMenuItemDeleteShelve ==
+Delete
+
+== PendingChangesMenuItemOpen ==
+Open
+
+== PendingChangesMenuItemOpenWith ==
+Open with...
+
+== PendingChangesMenuItemDiffAnnotateHistory ==
+Diff / Annotate / History
+
+== PendingChangesMenuItemDiffWorkspace ==
+Diff workspace contents
+
+== PendingChangesMenuItemAnnotate ==
+Annotate
+
+== PendingChangesMenuItemViewHistory ==
+History
+
+== PendingChangesMenuItemUndoChanges ==
+Undo changes
+
+== PendingChangesMenuItemDelete ==
+Delete
+
+== PendingChangesMenuItemCheckout ==
+Checkout
+
+== PendingChangesMenuItemSearchMatches ==
+Search matches...
+
+== PendingChangesMenuItemHideIgnoreCloak ==
+Hide / Ignore / Cloak
+
+== PendingChangesMenuItemHideIgnore ==
+Hide / Ignore
+
+== DirectoryConflictsTitleSingular ==
+1 directory conflict
+
+== DirectoryConflictsTitlePlural ==
+{0} directory conflicts
+
+== FileConflictsTitleSingular ==
+1 file conflict
+
+== FileConflictsTitlePlural ==
+{0} file conflicts
+
+== NoActionMenuItem ==
+No action available
+
+== ItemsMenuItemNew ==
+New
+
+== ItemsMenuItemNewDirectory ==
+Directory...
+
+== ItemsMenuItemNewFile ==
+File...
+
+== ItemsMenuAdd ==
+Add to source control
+
+== ItemsMenuAddRecursive ==
+Add directory tree to source control
+
+== ItemsMenuCheckin ==
+Checkin
+
+== ItemsMenuItemOpen ==
+Open
+
+== ItemsMenuItemOpenWith ==
+Open with...
+
+== ItemsMenuItemOpenWithCustom ==
+Open with {0}
+
+== ItemsMenuItemRevealInFinder ==
+Reveal in Finder
+
+== ItemsMenuItemCut ==
+Cut
+
+== ItemsMenuItemDelete ==
+Delete...
+
+== ItemsMenuItemPaste ==
+Paste
+
+== ItemsMenuItemCreateXlink ==
+Create Xlink...
+
+== ItemsMenuItemEditXlink ==
+Edit Xlink...
+
+== BrowseRepositoryMenuItemOpen ==
+Open
+
+== BrowseRepositoryMenuItemOpenWith ==
+Open with...
+
+== BrowseRepositoryMenuItemDiffWithPrevious ==
+Diff with previous revision
+
+== BrowseRepositoryMenuItemSaveAs ==
+Save as...
+
+== BrowseRepositoryMenuItemViewHistory ==
+View history
+
+== HistoryMenuItemOpen ==
+Open
+
+== HistoryMenuItemOpenWith ==
+Open with...
+
+== HistoryMenuItemSaveRevisionAs ==
+Save this revision as...
+
+== HistoryMenuItemDiffWithPrevious ==
+Diff with previous revision
+
+== HistoryMenuItemDiffSelectedRevisions ==
+Diff selected revisions
+
+== HistoryMenuItemDiffChangeset ==
+Diff changeset
+
+== HistoryMenuItemRevertToThisRevision ==
+Revert file to this revision
+
+== RenameDialogTitleSingular ==
+Rename item
+
+== RenameDialogTitlePlural ==
+Rename items
+
+== RenameDialogDescription ==
+Enter new name: 
+
+== ItemsMenuItemRename ==
+Rename...
+
+== ItemsMenuItemDiffWithPrevious ==
+Diff with previous revision
+
+== ListViewMenuItem ==
+View as a list
+
+== TreeViewMenuItem ==
+View as a tree
+
+== HidePrivateItems ==
+Hide private items
+
+== ExcludePrivateItemsSize ==
+Exclude privates from directory size
+
+== AutomaticMergesTitleSingular ==
+1 automatic merge
+
+== AutomaticMergesTitlePlural ==
+{0} automatic merges
+
+== MergeExplanationTitle ==
+Merge explanation
+
+== MergeWithPendingChangesTitle ==
+Changed files detected
+
+== MergeWithPendingChangesMessage ==
+You have changes pending to be checked in in your workspace. It is recommended that you checkin prior to merge to avoid possible issues undoing merges.
+If you are familiar with merge, you can change this behavior going to Preferences / Diff and merge / Allow to merge with pending changes.
+
+Note: we changed this behavior to avoid issues for new users, although it is not dangerous to enable it if you are familiar with how merge works.
+
+== MergeNotificationMessageTitle ==
+Notification message
+
+== BaseContributor ==
+Base
+
+== SrcContributor ==
+Source
+
+== DstContributor ==
+Destination
+
+== DeleteDialogTitleSingular ==
+Delete item
+
+== DeleteDialogTitlePlural ==
+Delete items
+
+== DeleteFromDiskSingular ==
+Delete item from disk
+
+== DeleteFromDiskPlural ==
+Delete items from disk
+
+== DoNotDeleteFromDiskSingular ==
+Do not delete item from disk
+
+== DoNotDeleteFromDiskPlural ==
+Do not delete items from disk
+
+== DeletingProgress ==
+Deleting {0}...
+
+== RemoveFromVersionControlSingular ==
+Remove item from version control
+
+== RemoveFromVersionControlPlural ==
+Remove items from version control
+
+== DiscardedConflictsTitleSingular ==
+1 discarded conflict
+
+== DiscardedConflictsTitlePlural ==
+{0} discarded conflicts
+
+== DirectoryConflictsCaption ==
+These are conflicts in the directory structure. Typically involve moves, renames, deletes. They must be solved before applying other changes.
+
+== DirectoryConflictsUnsolvedCaptionSingular ==
+directory conflict to solve.
+
+== DirectoryConflictsUnsolvedCaptionPlural ==
+directory conflicts to solve.
+
+== MergeAlreadyConnected ==
+La búsqueda de merges ha finalizado, el destino del merge ya incluye los cambios del origen.
+
+== MergeAlreadySubtracted ==
+La búsqueda de merges ha finalizado, el origen del merge ya ha sido sustraído del destino.
+
+== MergeInvalidInterval ==
+La búsqueda de merges ha finalizado, el intervalo seleccionado no es válido.
+
+== MergeNoMergesDetected ==
+La búsqueda de merges ha finalizado. No se han detectado merges.
+
+== MergeNoMergesDetectedCreateLink ==
+La búsqueda de merges ha finalizado. No se han detectado elementos a mezclar; sin embargo los changesets de origen y destino son diferentes. Normalmente esto ocurre cuando se han hecho los mismos cambios en el origen y en el destino. 
+
+Haga click en "Explicar merge" para ver más detalles de los contribuidores implicados. 
+
+Haga click en "Aplicar cambios" para unificar origen y destino (creando un enlace de merge entre ellos).
+
+
+== MergeNoMergesDetectedCreateLinkForIncomingView ==
+No hay nada que descargar
+
+Simplemente haga clic en "Actualizar espacio de trabajo" para mover su espacio de trabajo al comienzo de la rama.
+
+
+Explicación detallada: sus cambios coinciden con los realizados en la cabeza de la rama, por lo que realmente no hay nada que descargar, pero los metadatos deben sincronizarse.
+
+
+== MergeNothingToDownloadForIncomingView ==
+No hay nada que descargar
+
+
+== MergeNotConnected ==
+La búsqueda de merges ha finalizado, el origen y destino del merge subtractivo no están conectados.
+
+== MergeAlreadyProcessed ==
+Merge finished. Your changes are displayed ​on the pending changes view. Close this view and you will see them!
+
+== FileMergeTitleSingular ==
+1 change to apply
+
+== FileMergeTitlePlural ==
+{0} changes to apply
+
+== MergeChangedOnSrc ==
+Changes only in source contributor
+
+== MergeChangedOnSrcForIncomingView ==
+Actualizará
+
+== MergeWarningsTitleSingular ==
+1 conflicto descartado.
+
+== MergeWarningsTitlePlural ==
+{0} conflictos descartados.
+
+== MergeWarningsCaption ==
+Conflictos descartados y posibles advertencias.
+
+== DeleteDeleteWarningMessageSingular ==
+Deleted in the source of the merge, but also deleted on destination (1 item)
+
+== DeleteDeleteWarningMessagePlural ==
+Deleted in the source of the merge, but also deleted on destination ({0} items)
+
+== DiscardedAddedWarningMessageSingular ==
+Added in the source of the merge, but add already applied on destination (1 item)
+
+== DiscardedAddedWarningMessagePlural ==
+Added in the source of the merge, but add already applied on destination ({0} items)
+
+== DiscardedChangedWarningMessageSingular ==
+Changed in the source of the merge, but destination contents are exactly the same (1 item)
+
+== DiscardedChangedWarningMessagePlural ==
+Changed in the source of the merge, but destination contents are exactly the same ({0} items)
+
+== DiscardedDeleteWarningMessageSingular ==
+Deleted in the source of the merge. Destination tree doesn't have to load this path (1 item)
+
+== DiscardedDeleteWarningMessagePlural ==
+Deleted in the source of the merge. Destination tree doesn't have to load this path ({0} items)
+
+== DiscardedFSProtectionWarningMessageSingular ==
+Filesystem permissions changed in the source of the merge, but same permissions were already applied on the destination ((1 item)
+
+== DiscardedFSProtectionWarningMessagePlural ==
+Filesystem permissions changed in the source of the merge, but same permissions were already applied on the destination (({0} items)
+
+== DiscardedMovedWarningMessageSingular ==
+Moved in the source of the merge, but move already applied on the destination (1 item)
+
+== DiscardedMovedWarningMessagePlural ==
+Moved in the source of the merge, but move already applied on the destination ({0} items)
+
+== PathInConflictWarningMessageSingular ==
+These items were renamed because the paths were already in use during the merge operation (1 item)
+
+== PathInConflictWarningMessagePlural ==
+These items were renamed because the paths were already in use during the merge operation ({0} items)
+
+== XlinkWarningMessageSingular ==
+{0} (1 item)
+
+== XlinkWarningMessagePlural ==
+{0} ({{0}} items)
+
+== DivergentMoveConflictsSingular ==
+Divergent move conflicts (1 item)
+
+== DivergentMoveConflictsPlural ==
+Divergent move conflicts ({0} items)
+
+== CyleMoveConflictsSingular ==
+Cycle move conflicts (1 item)
+
+== CyleMoveConflictsPlural ==
+Cycle move conflicts ({0} items)
+
+== EvilTwinsSingular ==
+Evil twin conflicts (1 item)
+
+== EvilTwinsPlural ==
+Evil twin conflicts ({0} items)
+
+== MoveDeleteConflictsSingular ==
+Move/Delete conflicts (1 item)
+
+== MoveDeleteConflictsPlural ==
+Move/Delete conflicts ({0} items)
+
+== DeleteMoveConflictsSingular ==
+Delete/Move conflicts (1 item)
+
+== DeleteMoveConflictsPlural ==
+Delete/Move conflicts ({0} items)
+
+== MovedEvilTwinsSingular ==
+Moved evil twin conflicts (1 item)
+
+== MovedEvilTwinsPlural ==
+Moved evil twin conflicts ({0} items)
+
+== AddMoveConflictsSingular ==
+Add/Move conflicts (1 item)
+
+== AddMoveConflictsPlural ==
+Add/Move conflicts ({0} items)
+
+== MoveAddConflictsSingular ==
+Move/Add conflicts (1 item)
+
+== MoveAddConflictsPlural ==
+Move/Add conflicts ({0} items)
+
+== LoadedTwiceConflictsSingular ==
+Items loaded twice conflicts (1 item)
+
+== LoadedTwiceConflictsPlural ==
+Items loaded twice conflicts ({0} items)
+
+== MoveSourceDeleteConflictsSingular ==
+Move/Delete, move out of delete conflicts (1 item)
+
+== MoveSourceDeleteConflictsPlural ==
+Move/Delete, move out of delete conflicts ({0} items)
+
+== DeleteMoveSourceConflictsSingular ==
+Delete/Move, move out of delete conflicts (1 item)
+
+== DeleteMoveSourceConflictsPlural ==
+Delete/Move, move out of delete conflicts ({0} items)
+
+== ChangeDeleteConflictsSingular ==
+Change/Delete conflicts (1 item)
+
+== ChangeDeleteConflictsPlural ==
+Change/Delete conflicts ({0} items)
+
+== DeleteChangeConflictsSingular ==
+Delete/Change conflicts (1 item)
+
+== DeleteChangeConflictsPlural ==
+Delete/Change conflicts ({0} items)
+
+== ReadonlyXlinkConflictsSingular ==
+Readonly Xlink conflicts (1 item)
+
+== ReadonlyXlinkConflictsPlural ==
+Readonly Xlink conflicts ({0} items)
+
+== ResolveDirectoryConflict ==
+Resolve directory conflict
+
+== ResolveDirectoryConflictChooseOption ==
+In order to resolve the conflict, choose one of the following options:
+
+== SelectAMatch ==
+Please select a change to be matched
+
+== SearchMatchesDialogTitle ==
+Search moved candidates
+
+== SearchMatchesDialogExplanation ==
+All possible sources for the new item are displayed. Slide the bar below to change the similarity threshold.
+
+== MinSimilarityAccepted ==
+Min. accepted similarity: {0:0.0}
+
+== LoadingMatches ==
+Loading matches...
+
+== SrcPathColumn ==
+Source path
+
+== DstPathColumn ==
+Destination path
+
+== SimilarityColumn ==
+Similarity
+
+== MergeCategoryNameSingular ==
+Merged from {0}: 1 item
+
+== MergeCategoryNamePlural ==
+Merged from {0}: {{0}} items
+
+== AddedMergeDiffSingular ==
+Added (files added in the merge source): 1 item
+
+== AddedMergeDiffPlural ==
+Added (files added in the merge source): {0} items
+
+== DeletedMergeDiffSingular ==
+Deleted (files deleted in the merge source): 1 item
+
+== DeletedMergeDiffPlural ==
+Deleted (files deleted in the merge source): {0} items
+
+== MergedMergeDiffSingular ==
+Merged (files changed in the merge source and in the merge destination): 1 item
+
+== MergedMergeDiffPlural ==
+Merged (files changed in the merge source and in the merge destination): {0} items
+
+== MovedMergeDiffSingular ==
+Moved (files moved in the merge source): 1 item
+
+== MovedMergeDiffPlural ==
+Moved (files moved in the merge source): {0} items
+
+== ReplacedMergeDiffSingular ==
+Changed (files changed in the merge source): 1 item
+
+== ReplacedMergeDiffPlural ==
+Changed (files changed in the merge source): {0} items
+
+== AddedDiffSingular ==
+Added: 1 item
+
+== AddedDiffPlural ==
+Added: {0} items
+
+== ChangedDiffSingular ==
+Changed: 1 item
+
+== ChangedDiffPlural ==
+Changed: {0} items
+
+== DeletedDiffSingular ==
+Deleted: 1 item
+
+== DeletedDiffPlural ==
+Deleted: {0} items
+
+== MovedDiffSingular ==
+Moved: 1 item
+
+== MovedDiffPlural ==
+Moved: {0} items
+
+== MergedDiffSingular ==
+Merged: 1 item
+
+== MergedDiffPlural ==
+Merged: {0} items
+
+== FSProtectionDiffSingular ==
+Only filesystem permissions changed: 1 item
+
+== FSProtectionDiffPlural ==
+Only filesystem permissions changed: {0} items
+
+== Source ==
+Source:
+
+== Destination ==
+Destination:
+
+== KeepSrcChanges ==
+Keep source changes
+
+== KeepSrcNotSupported ==
+Keeping the source item is not supported for this type of conflict
+
+== KeepDstChanges ==
+Keep destination changes
+
+== KeepDstNotSupported ==
+Keeping the destination item is not supported for this type of conflict
+
+== RenameOnDst ==
+Rename item in your workspace
+
+== RenameNotSupported ==
+Renaming of destination item is not supported for this type of conflict
+
+== InputItemNameMessage ==
+Please input an item name
+
+== AutomaticMergesUnsolvedCaptionSingular ==
+1 item to merge
+
+== AutomaticMergesUnsolvedCaptionPlural ==
+{0} items to merge
+
+== HelpButton ==
+Help
+
+== AdvancedButton ==
+Advanced
+
+== AdvancedButtonAmp ==
+&Advanced
+
+== BranchExplorerMenuButton ==
+Branch Explorer
+
+== BranchExplorerSearchFieldTooltip ==
+Type a search pattern. Use cs: lb: or br: to restrict results
+
+== BranchExplorerSearchFieldShortcutsTooltip ==
+Keyboard shortcuts:
+  Enter: focus the next search result
+  Ctrl+Enter: focus the previous one
+
+== BranchColumn ==
+Branch
+
+== CancelButton ==
+Cancel
+
+== CancelButtonAmp ==
+&Cancel
+
+== CloseButton ==
+Close
+
+== OkButton ==
+OK
+
+== YesButton ==
+Yes
+
+== NoButton ==
+No
+
+== CheckinButton ==
+Checkin
+
+== CheckinButtonAmp ==
+Check&in
+
+== CheckinToADifferentBranchButton ==
+Checkin changes to a different branch...
+
+== CheckinToADifferentBranch ==
+Checkin changes to a different branch
+
+== MoveChangesetsToADifferentBranch ==
+Move changesets to a different branch
+
+== ShelveButton ==
+Shelve
+
+== ShowShelvesButton ==
+Show shelves
+
+== ShowShelvesViewTooltip ==
+Show the shelves view
+
+== OptionsTooltip ==
+Configure the pending changes options
+
+== ChooseMessage ==
+Choose...
+
+== GluonConfigurationSelectRepositoryButton ==
+Select...
+
+== GluonConfigurationBrowseWorkspacePathButton ==
+Choose Path...
+
+== GluonConfigurationCreateRepositoryButton ==
+Create...
+
+== ChooseMessageAmp ==
+Ch&oose...
+
+== ChooseMessageAmp2 ==
+C&hoose...
+
+== NewMessageAmp ==
+&New...
+
+== ConflictColumn ==
+Conflict
+
+== CheckinMergeTitle ==
+User action required at checkin
+
+== ChangesetColumn ==
+Changeset
+
+== DefaultBranchesQuery ==
+find branch
+
+== DefaultChangesetsQuery ==
+find changeset
+
+== ExecuteButton ==
+Execute
+
+== ExecuteButtonAmp ==
+&Execute
+
+== FileConflictsCaptionSingular ==
+file conflict to solve.
+
+== FileConflictsCaptionPlural ==
+file conflicts to solve.
+
+== FileConflictsCaptionForIncomingViewSingular ==
+file in conflict with your changes.
+
+== FileConflictsCaptionForIncomingViewPlural ==
+files in conflict with your changes.
+
+== FileConflictsUnsolvedCaption ==
+For {0} items, both source and destination contributors have changes. User interaction might be required (manual merge)
+
+== FilterLabel ==
+Filter:
+
+== Controlled ==
+Controlled
+
+== ItemsMenuCheckout ==
+Checkout
+
+== ItemsMenuLockAndCheckout ==
+Lock and checkout
+
+== ItemsMenuCheckoutRecursive ==
+Checkout recursively
+
+== CheckedOut ==
+Checked-out
+
+== Deleted ==
+Deleted
+
+== Changed ==
+Changed on disk
+
+== ContainsChanges ==
+Contains changes
+
+== Private ==
+Private
+
+== Ignored ==
+Ignored
+
+== Ignore ==
+Ignore
+
+== Cloaked ==
+Cloaked
+
+== Cloak ==
+Cloak
+
+== HiddenChanged ==
+Hidden changed
+
+== SwitcherMainWindowTitle ==
+Plastic SCM - Switcher
+
+== MainWindowTitle ==
+Plastic SCM - wk: {0} - {1} - {2}: {3}@{4}
+
+== GluonMainWindowTitle ==
+Gluon - wk: {0} - {1}
+
+== StatusInfo ==
+You are browsing {0} {1}@{2}
+
+== DiffWindowTitle ==
+Comparing previous content with revisions on {0}
+
+== ChangesetsDiffWindowTitle ==
+Comparing revisions on {0} with revisions on {1}
+
+== FsProtectionDifferences ==
+Filesystem permissions changed from {0} to {1}
+
+== NoItemsToUndo ==
+No items are selected. Use items' checkboxes to select them. This can also occur if you have selected items, but they are all private or ignored.
+
+== ProgressSizeMessage ==
+{0} of {1}
+
+== ResolveConflictsButton ==
+Resolver conflictos
+
+== ApplyChangesButton ==
+Aplicar cambios
+
+== QueryLabel ==
+Query:
+
+== RefreshButton ==
+Refresh
+
+== RefreshButtonAmp ==
+&Refresh
+
+== GoHomeButton ==
+Home
+
+== GoHomeTooltip ==
+Go to working changeset
+
+== OnlyRelevantButton ==
+Only relevant
+
+== OnlyRelevantTooltip ==
+Show only relevant changesets
+
+== ResolutionMethodColumn ==
+Resolution method
+
+== SolvedConflict ==
+Solved conflict
+
+== UndoButton ==
+Undo
+
+== UndoButtonAmp ==
+&Undo
+
+== UndoUnchangedButton ==
+Undo unchanged
+
+== UndoRequest ==
+Confirm undoing changes
+
+== UndoRequestMessageSingular ==
+You are going to undo 1 change. This operation can't be undone. Continue?
+
+== UndoRequestMessagePlural ==
+You are going to undo {0} changes. This operation can't be undone. Continue?
+
+== CheckoutIgnoringFailedRequest ==
+Some files can't be checkedout because they are locked
+
+== CheckoutIgnoringFailedRequestMessage ==
+
+Do you want to skip the locked files and checkout the rest?
+
+The locked files are: {0}
+
+== UndoUnchangedRequestMessage ==
+You are going to undo unchanged items. This operation can't be undone. Continue?
+
+== UndoWithMergeLinkMessageSingular ==
+You are going to undo 1 change and the related merge links. This operation can't be undone. Continue?
+
+== UndoWithMergeLinkMessagePlural ==
+You are going to undo {0} changes and the related merge links. This operation can't be undone. Continue?
+
+== UnsolvedConflict ==
+Unsolved conflict
+
+== PendingChangesOptionsTitle ==
+Pending changes options
+
+== CreatingRepository ==
+Creating repository {0}...
+
+== CreatingWorkspace ==
+Creating workspace {0}...
+
+== WaitingForDynamicWorkspaceToBeMounted ==
+Waiting to mount dynamic workspace {0} ...
+
+== CreatingBranch ==
+Creating branch {0}...
+
+== CreatingLabel ==
+Creating label {0}...
+
+== RepositoryNameAlreadyExists ==
+The repository {0} already exists
+
+== RenamingRepository ==
+Renaming repository...
+
+== RenamingWorkspace ==
+Renaming workspace {0}...
+
+== RenamingBranch ==
+Renaming branch {0}...
+
+== RenamingLabel ==
+Renaming label {0}...
+
+== EditingAttribute ==
+Editando atributo '{0}'...
+
+== ChangingRevisionType ==
+Changing the revision type...
+
+== DeletingWorkspacesSingular ==
+Deleting workspace{0}...
+
+== DeletingWorkspacesPlural ==
+Deleting workspaces{0}...
+
+== DeletingRepositoriesSingular ==
+Deleting repository{0}...
+
+== DeletingRepositoriesPlural ==
+Deleting repositorys{0}...
+
+== UndeletingRepositoriesSingular ==
+Undeleting repository{0}...
+
+== UndeletingRepositoriesPlural ==
+Undeleting repositorys{0}...
+
+== DeletingBranchesSingular ==
+Deleting branch{0}...
+
+== DeletingBranchesPlural ==
+Deleting branchs{0}...
+
+== DeletingLabelsSingular ==
+Deleting label{0}...
+
+== DeletingLabelsPlural ==
+Deleting labels{0}...
+
+== DeletingShelvesSingular ==
+Deleting shelve...
+
+== DeletingShelvesPlural ==
+Deleting shelves...
+
+== DeletingChangeset ==
+Deleting changeset...
+
+== DeletingAttributesSingular ==
+Eliminando atributo {0}...
+
+== DeletingAttributesPlural ==
+Eliminando atributos {0}...
+
+== MovingChangeset ==
+Moving changeset...
+
+== PreviousLabel ==
+Previous result
+
+== NextLabel ==
+Next result
+
+== BrexSearchFieldLabel ==
+Branch Explorer search
+
+== BrexDisplayOptions ==
+Display options
+
+== DateFilterTitle ==
+Date filter:
+
+== InitialDateLabel ==
+From:
+
+== EndDateLabel ==
+To:
+
+== SinceDateLabel ==
+Since:
+
+== InitialDateMessageError ==
+The initial date {0} of the date filter is invalid
+
+== EndDateMessageError ==
+The end date {0} of the date filter is invalid
+
+== ResetDateFilterButton ==
+Reset to defaults
+
+== ApplyDateFilterButton ==
+Apply filter
+
+== Done ==
+Done.
+
+== SelectAll ==
+Select all
+
+== MergeSelectedFiles ==
+Merge selected files
+
+== MergeKeepingSourceChanges ==
+Merge keeping source changes (theirs)
+
+== MergeKeepingWorkspaceChanges ==
+Merge keeping workspace changes (yours/destination)
+
+== DiffDestinationWithSource ==
+Diff source with destination contributor
+
+== DiffDestinationWithAncestor ==
+Diff ancestor with destination contributor
+
+== DiffSourceWithAncestor ==
+Diff ancestor with source contributor
+
+== DiffSourceWithDestinationEvilTwin ==
+Diff item added on source with item added on destination
+
+== DiffSourceWithDestinationAddMove ==
+Diff item added on source with item moved on destination
+
+== DiffSourceWithDestinationCycleMove ==
+Diff item moved on source with item moved on destination
+
+== DiffSourceWithDestinationDeleteMove ==
+Diff item deleted on source with item moved on destination
+
+== DiffSourceWithDestinationMoveAdd ==
+Diff item moved on source with item added on destination
+
+== DiffSourceWithDestinationMoveDelete ==
+Diff item moved on source with item deleted on destination
+
+== DiffSourceWithDestinationMoveEvilTwin ==
+Diff item moved on source with item moved on destination
+
+== RetryUpdate ==
+Retry update
+
+== UpdateForced ==
+Update forced
+
+== LoadingWorkspaces ==
+Loading workspaces...
+
+== WaitingForDynamicWorkspaces ==
+Mounting dynamic workspaces ...
+
+== LoadingHistory ==
+Loading history...
+
+== LoadingAnnotations ==
+Loading annotations...
+
+== LoadingBrowseRepository ==
+Loading changeset tree...
+
+== ProcessingMerge ==
+Processing merge...
+
+== CalculatingMerge ==
+Calculating merges...
+
+== CalculatingIncomingChanges ==
+Calculating incoming changes...
+
+== LoadingFindMerge ==
+Buscando elementos a mezclar, por favor espere...
+
+== LoadingPendingChanges ==
+Finding changes in the workspace...
+
+== LabellingWorkspace ==
+Applying the label {0} to the workspace...
+
+== LabellingChangeset ==
+Applying the label {0} to the changeset {1}...
+
+== ApplyingLocalChanges ==
+Aplicando cambios locales...
+
+== ApplyingConflicts ==
+Applying conflicts...
+
+== LoadingRepositories ==
+Loading repositories...
+
+== PendingChangesOptionsExplanation ==
+Select the type of items to be displayed 
+These following options let you choose how the items are shown in the 'Pending changes' view:
+
+== NewRepositoryExplanation ==
+Type a name for the new repo and make sure you will create it on the correct server.
+
+== NewWorkspaceExplanation ==
+The workspace is the local copy to work on files and make changes. A workspace handles a single branch at a time. The workspace can be switched to a different branch even on a different repository.
+
+== RenameWorkspaceExplanation ==
+Renaming the workspace won’t modify its path.
+
+== PendingChangesOptionsInfo ==
+* This option requires a disk search, so if your workspace is very large, or it has lots of private files, the operation could take a while.
+
+== AutoRefreshPendingChangesButton ==
+Auto-refresh
+
+== AutoRefreshPendingChangesLabel ==
+Refresh the Checkin Changes view when it gets the focus.
+
+== CheckedOutCheckButton ==
+Show checked-out items
+
+== CheckedOutLabel ==
+Show items that have been explicitly checked out for editing by the user.
+
+== ChangedCheckButton ==
+Show changed items *
+
+== ChangedCheckLabel ==
+Show items that have been changed on disk, but not checked out in Plastic SCM.
+
+== PrivateCheckButton ==
+Show private items *
+
+== PrivateCheckLabel ==
+Show items that are not under source control, so they are private for the workspace.
+
+== IgnoredCheckButton ==
+Show ignored objects *
+
+== IgnoredCheckLabel ==
+Show those private items that have been marked to be ignored.
+
+== ItemSearchMenuTitle ==
+Search menu
+
+== ItemSearchField ==
+Item search
+
+== SearchInProgress ==
+Searching...
+
+== SearchIncludePrivateItems ==
+Include private items
+
+== HiddenChangedCheckButton ==
+Show hidden changed items *
+
+== HiddenChangedCheckLabel ==
+Show those changed items that have been marked to be ignored.
+
+== ManuallyDeletedCheckButton ==
+Show manually deleted items *
+
+== ManuallyDeletedCheckLabel ==
+Show items that have been deleted on disk out of Plastic SCM control.
+
+== ManuallyMovedCheckButton ==
+Show manually renamed/moved items *
+
+== ManuallyMovedCheckLabel ==
+Show items that have been moved or renamed on disk, out of the Plastic SCM control.
+
+== BinSameExtOnlyCheckButton ==
+Match binary files only if they have the same extension
+
+== TxtSameExtOnlyCheckButton ==
+Match text files only if they have the same extension
+
+== LookForNewerChangesCheckButton ==
+Look for newer changes in the repository
+
+== LookForNewerChangesCheckLabel ==
+Show information when there are newer changes in the repository (checks working branch/changeset)
+
+== SizeColumn ==
+Size
+
+== Show ==
+Show
+
+== Hide ==
+Hide
+
+== BinaryFile ==
+Binary
+
+== Directory ==
+Directory
+
+== TextFile ==
+Text
+
+== LinkFile ==
+Symlink
+
+== Unknown ==
+Unknown
+
+== CustomExtensionFile ==
+Custom extension
+
+== CreateChildBranchTitle ==
+Create Branch
+
+== CreateChildBranchExplanation ==
+Create a new child branch from
+
+== ReplicateBranchTitle ==
+Plastic SCM Replication
+
+== ReplicateBranchExplanation ==
+Replicate a branch from/to another repository.
+
+== UsingProfile ==
+Profile: {0}
+
+== DefaultProfile ==
+Using default configuration
+
+== LabelChangesetExplanation ==
+Label changeset {0} of {1}@{2}
+
+== RenameBranchTitle ==
+Rename Branch
+
+== EditAttributeTitle ==
+Editar atributo
+
+== CreateLabelTitle ==
+Apply a label to a changeset
+
+== CreateLabelExplanation ==
+Labels help highlighting important changesets. Typically labels are used to mark stable baselines and releases to customers.
+
+== RenameLabelTitle ==
+Rename Label
+
+== LastChangeset ==
+last changeset
+
+== BranchNameEntry ==
+Branch name:
+
+== BranchNameAlreadyExists ==
+The branch {0} already exists
+
+== LabelNameAlreadyExists ==
+The label {0} already exists ({1})
+
+== LabelNameEntry ==
+Label name:
+
+== AttributeNameEntry ==
+Nombre del atributo:
+
+== ChangesetToLabelEntry ==
+Changeset to label:
+
+== CommentsEntry ==
+Comments:
+
+== SwitchToBranchCheckButton ==
+Switch workspace to this branch
+
+== SwitchToLabelCheckButton ==
+Switch workspace to this label
+
+== SwitchToBranchTitle ==
+Switch to branch
+
+== SwitchToChangesetTitle ==
+Switch to changeset
+
+== SwitchToLabelTitle ==
+Switch to label
+
+== SwitchToExplanation ==
+There are pending changes in your workspace.
+
+You can continue with the switch operation or cancel the switch and open a Pending Changes view, so that you can checkin (or undo) the pending changes. Then, you can run the "{0}" command again.
+
+If you continue with the switch operation, your local changes won't be lost, and will still appear as pending changes after the switch operation.
+
+== SwitchToLabelExplanation ==
+There are pending changes in your workspace.
+
+You can continue with the switch operation or cancel the switch and open a Pending Changes view, so that you can checkin (or undo) the pending changes. Then, you can run the "Switch workspace to this label" command again.
+
+If you continue with the switch operation, your local changes won't be lost, and will still appear as pending changes after the switch operation, but you won't be able to submit these changes, as a label configuration is a read-only configuration.
+
+To modify a labeled configuration, create a branch, setting the label as the branch base. Then, switch the workspace to that branch and make changes as usual.
+
+== SwitchToConfirmationCheckButton ==
+Don't show this dialog again
+
+== SwitchToConfirmationContinueButton ==
+Continue with the switch
+
+== SwitchToConfirmationCancelViewChangesButton ==
+Cancel and view changes
+
+== SwitchToConfirmation ==
+You are changing your workspace configuration. Continue?
+
+== SwitchToBranchConfirmation ==
+You are changing your workspace configuration to the branch: {0}.
+
+Continue?
+
+== SwitchToLabelConfirmation ==
+Switching your workspace to a label, which loads the labeled revision of each item. All the loaded revisions will be read-only.
+
+To modify a labeled configuration, create a branch, setting the label as the branch base. Then, switch the workspace to that branch and make changes as usual.
+
+Continue?
+
+== SwitchActionOptionsTitle ==
+Behavior when trying to switch / update the workspace with changed items
+
+== SwitchActionAllowOption ==
+Allow
+
+== SwitchActionWarnOption ==
+Allow, showing a warning
+
+== SwitchActionFailOption ==
+Do not allow, show an error
+
+== UpdateResultsTitle ==
+Update results
+
+== UpdateResultsExplanation ==
+The update operation found some issues. Please review them.
+
+== CheckinConflictsTitle ==
+Checkin conflicts
+
+== CheckinConflictsExplanation ==
+The checkin operation found the following conflicts that can't be checked in.
+Click "OK" to continue the operation for the items not in conflict.
+Click "Cancel" to abort the entire operation. 
+
+== CheckinConflictsToMergeTitle ==
+Files need merge
+
+== CheckinConflictsToMergeExplanation ==
+There are newer changes that need merging with yours
+Click "Merge" to merge the files now.
+Otherwise click "Cancel".
+
+== EditAttributeExplanation ==
+Puedes renombrar el atributo y cambiar el texto de su comentario.
+
+== ResetQueryButton ==
+Reset query
+
+== ClearHistoryButton ==
+Clear history
+
+== SetAsDefaultQuery ==
+Set as default query
+
+== NewDirectoryTitle ==
+Create a new directory
+
+== NewFileTitle ==
+Create a new empty file
+
+== NewDirectory ==
+New directory
+
+== NewFile ==
+New file
+
+== RenameDirectoryTitle ==
+Rename Directory
+
+== RenameFileTitle ==
+Rename File
+
+== NewSyncTitle ==
+Create a new Sync View
+
+== DependenciesTitle ==
+Undo checkout dependencies
+
+== DependenciesDialogTitle ==
+Pending dependencies
+
+== AddChildBranches ==
+Add child branches
+
+== AddParentBranches ==
+Add parent branches
+
+== AddBranchesSourceOfMerge ==
+Add branches source of merge
+
+== AddBranchesDestinationOfMerge ==
+Add branches destination of merge
+
+== TypeRule ==
+Type a rule here
+
+== TypeDescription ==
+Type a description here
+
+== ConditionalBranchRulesHelp ==
+Puede escribir una consulta en el formato del 'cm find' pero sin tener que especificar 'find branch'.
+Consulte la 'find guide' para más información.
+Ejemplos:
+  changesets >= '2 months ago'
+  attribute = 'status' and attrvalue='finished'
+
+== ConditionalChangesetRulesHelp ==
+Puede escribir una consulta en el formato del 'cm find' pero sin tener que especificar 'find changesets'.
+Consulte la 'find guide' para más información.
+Ejemplos:
+  branch = 'main'
+  attribute = 'status' and attrvalue='finished'
+
+== ConditionalLabelRulesHelp ==
+Puede escribir una consulta en el formato del 'cm find' pero sin tener que especificar 'find labels'.
+Consulte la 'find guide' para más información.
+Ejemplos:
+  date >= '2 months ago'
+  attribute = 'status' and attrvalue='finished'
+
+== DependenciesExplanation ==
+Some selected items depend on others that need to be included in the operation as well.
+Click "{0}" to proceed with all dependent items (recommended), or cancel the operation.
+
+== MergeLinkDescriptionColumn ==
+Merge link description
+
+== TaskIdColumn ==
+ID
+
+== TaskTitleColumn ==
+Title
+
+== AssigneeColumn ==
+Assignee
+
+== LocationColumn ==
+Ubicación
+
+== Merge ==
+Merge
+
+== CherryPick ==
+Cherry pick
+
+== IntervalMerge ==
+Interval merge
+
+== SubtractiveMerge ==
+Subtractive merge
+
+== SubtractiveIntervalMerge ==
+Subtractive interval merge
+
+== UnsupportedMergeType ==
+Unsupported merge type
+
+== MergeSourceFormat ==
+{0} at {1}@{2}
+
+== ConfirmDeleteTitle ==
+Confirm delete
+
+== ConfirmApplyLabelTitle ==
+Confirm labeling operation
+
+== ConfirmApplyLabelExplanation ==
+Applying label "{0}" to all revisions currently in your workspace. Continue
+
+== BranchNameEmpty ==
+Branch name must not be empty
+
+== LabelNameEmpty ==
+Label name must not be empty
+
+== SyncViewNameEmpty ==
+Sync view name must not be empty
+
+== AttributeNameEmpty ==
+El nombre del atributo no puede estar vacío
+
+== LabelButton ==
+Label
+
+== LabelAllXlinksCheckButton ==
+Label all writable xlinked repositories
+
+== RenameButton ==
+Rename
+
+== Rename ==
+Rename
+
+== CreateButton ==
+Create
+
+== SaveButton ==
+Save
+
+== DeleteButton ==
+Delete
+
+== SwitchButton ==
+Switch
+
+== DiffWindowMenuItemDiff ==
+Diff
+
+== ApplyButton ==
+Apply
+
+== MergeButton ==
+Merge
+
+== BrExNewChangesetWillBeCreated ==
+New changeset
+
+== BrexMergeLinkTitle ==
+Merge link {0}
+
+== BrexMergeLinkCaptionBody ==
+Source: {0}{1}Destination: {2}
+
+== BrexMergeLinkPending ==
+, pending
+
+== BrexMergeChangesetInterval ==
+Changeset interval ({0} - {1}]
+
+== BrexMergeCouldNotMerge ==
+[Ops, could not get the interval data!]
+
+== BrexMergeChangesetOnBranch ==
+changeset {0} on branch {1}
+
+== BrexCherryPickLinkType ==
+(Cherry pick)
+
+== BrexIntervalCherryPickLinkType ==
+(Cherry pick from changeset interval)
+
+== BrexIntervalCherryPickSubstractiveLinkType ==
+(Subtractive from changeset interval)
+
+== BrexCherryPickSubstractiveLinkType ==
+(Subtractive)
+
+== BrexProperties ==
+Properties
+
+== BrexAttributes ==
+Attributes
+
+== CredentialsDialogTitle ==
+Connect to server
+
+== CredentialsDialogExplanation ==
+Please enter your credentials to connect to {0}
+
+== UserName ==
+User name:
+
+== Password ==
+Password:
+
+== UndefinedServer ==
+Undefined server
+
+== RememberCredentialsAsProfile ==
+Remember credentials as a connection profile
+
+== CredentialsErrorSavingProfile ==
+Error saving the connection profile: {0}
+
+== BrexObjectNameProperty ==
+Object name:
+
+== BrexCreationDateProperty ==
+Creation date:
+
+== BrexOwnerProperty ==
+Owner:
+
+== BrexReplicationSourceProperty ==
+Replication src:
+
+== BrexGuidProperty ==
+Guid:
+
+== BrexCommentsProperty ==
+Comments:
+
+== BrexDisplayBranches ==
+Display branches
+
+== BrexDisplayFullBranchNames ==
+Display full branch names
+
+== BrexDisplayMergeLinks ==
+Display merge links
+
+== BrexDisplayCrossBranchCsetLinks ==
+Display cross-branch changeset links
+
+== BrexDisplayLabels ==
+Display labels
+
+== BrexDisplayBranchTaskInfo ==
+Display branch task info
+
+== BrexDisplayVerticalLayout ==
+Display vertical layout
+
+== BrexDisplayOnlyRelevantCsets ==
+Display only relevant changesets
+
+== NoReplicationSources ==
+Not replicated
+
+== PlasticSCMConfiguration ==
+Plastic SCM Configuration
+
+== GluonConfiguration ==
+Gluon Configuration
+
+== PlasticSCMConfigurationCloud ==
+Welcome to Cloud Edition!
+
+== PlasticCloudEditionWelcome ==
+Welcome to Plastic SCM Cloud Edition
+
+== PlasticCloudEditionConfiguration ==
+Plastic Cloud Edition configuration
+
+== EnterServer ==
+Please enter a server name
+
+== EnterServerFormat ==
+Please specify the server name in server:port format. Default port is 8087
+
+== EnterUserName ==
+Please enter a user name
+
+== EnterEmail ==
+Please enter an email or user name
+
+== EnterPassword ==
+Please enter a password
+
+== EnterRepository ==
+Please enter a repository
+
+== EnterCloudRepository ==
+Please enter a Cloud repository name
+
+== EnterLocalRepository ==
+Please enter a local repository name
+
+== EnterWorkspacePath ==
+Please enter a workspace path
+
+== NoValidPath ==
+No valid path
+
+== Connected ==
+Connected OK ({0})
+
+== CredentialsOK ==
+Credentials checked OK
+
+== ConfigureServer ==
+Please enter the Plastic SCM server location. Ask your sysadmin if you don't know its name or IP.
+
+== ConfigureServerScan ==
+You can also try to scan your network to find the server (it will work depending on how the network is configured):
+
+== GluonConfigureServer ==
+You need to specify where the Plastic SCM server is. Ask your sysadmin if you don't know the name or IP of the server.
+
+== UserNameWillBeUsed ==
+The following username will be used:
+
+== ConfigureCredentials ==
+Configure your credentials:
+
+== ConfigureCredentialsCloudEditionLine1 ==
+Please enter the user and password you use to connect to Plastic Cloud (same as plasticscm.com).
+
+== ConfigureCredentialsCloudEditionLine2 ==
+This is also the user name that will identify you each time you checkin, so choose wisely.
+
+== Connecting ==
+Connecting...
+
+== CheckingCredentials ==
+Checking credentials...
+
+== EnterOrganizationWaterMark ==
+Enter your Plastic Cloud organization name
+
+== EnterServerWaterMark ==
+e.g: myserver.mynetwork.net:8087
+
+== Connect ==
+Connect
+
+== ConnectAmp ==
+&Connect
+
+== Scan ==
+Scan...
+
+== ScanNetwork ==
+Scan network...
+
+== ScanNetworkAmp ==
+&Scan network...
+
+== UserNameWaterMark ==
+username
+
+== PasswordWaterMark ==
+password
+
+== Check ==
+Check
+
+== CheckAmp ==
+Chec&k
+
+== ChooseRepository ==
+Choose a repository:
+
+== ChooseRepositoryCloudEdition ==
+Join an existing project or create a new one
+
+== EnterRepositoryWaterMark ==
+Enter a repository name or choose from the list
+
+== SelectWorkingDirectory ==
+Select your working directory (a.k.a workspace) - this is the directory that will contain the files you will be working with:
+
+== GluonConfigurationWorkspaceLabel ==
+Workspace:
+
+== GluonConfigurationWorkspaceExplanation ==
+Select your working directory (a.k.a workspace). This is the directory that will contain the files you will be working with
+
+== WorkspacePath ==
+Workspace path
+
+== ApplyingChanges ==
+Applying changes...
+
+== Apply ==
+Apply
+
+== ApplyAmp ==
+&Apply
+
+== MustBeConnectedToExplore ==
+Check you can connect first. Click to check credentials.
+
+== MustBeConnectedToCreateRepository ==
+Connect to the server first. Click check credentials.
+
+== MustBeConnectedToCreateRepositoryCloudEdition ==
+You must be connected to an organization to create repositories. Check your credentials
+
+== CouldNotFindRepository ==
+Could not find repository {0}
+
+== CouldNotFindWorkingRepositoryOrBranch ==
+Could not find working repository or branch
+
+== UserUnknown ==
+User unknown {0}
+
+== AvailableChangesets ==
+Available Plastic SCM changesets
+
+== SelectChangesetBelow ==
+Please select a changeset from the list below:
+
+== AvailableBranches ==
+Available Plastic SCM branches
+
+== AvailableRepositories ==
+Available Plastic SCM repositories
+
+== SelectBranchesBelow ==
+Please select a branch from the list below:
+
+== SelectRepositoryBelow ==
+Please select a repository from the list below:
+
+== AvailableServers ==
+Available Plastic SCM servers
+
+== NoServersFound ==
+No servers found :-(
+
+== SelectServerBelow ==
+Please select a server from the list below:
+
+== ScanningForServers ==
+Scanning for servers...
+
+== AddressColumn ==
+Address
+
+== PortColumn ==
+Port
+
+== OpsErrorOccured ==
+Oops! An error occurred
+
+== FilterWaterMark ==
+Filter
+
+== WorkspaceNameWaterMark ==
+Workspace name
+
+== WorkspacePathWaterMark ==
+Workspace path
+
+== NewWorkspaceTitle ==
+Create a new workspace to start working with Plastic SCM
+
+== Actions ==
+Actions
+
+== ExploreWorkspace ==
+Explore workspace
+
+== CheckinChanges ==
+Checkin changes
+
+== Configure ==
+Configure
+
+== ConfigureAmp ==
+&Configure
+
+== Loading ==
+Loading...
+
+== CantPerformOperation ==
+Can't perform the operation
+
+== OperationRunning ==
+Operation running
+
+== OperationInProgress ==
+There is one operation currently running. Please wait until it is finished.
+
+== ConfirmClosingRunningOperation ==
+An operation is currently running. Are you sure you want to quit?
+
+== FileNotFoundTitle ==
+The specified file has not been found
+
+== FileNotFound ==
+Could not find {0}
+
+== SearchFiles ==
+Search files...
+
+== SearchFilesAmp ==
+&Search files...
+
+== SearchFilesTooltip ==
+Ctrl+F
+
+== SearchFilesHint ==
+You can use '*' and '?' to match file names. You can also use directories in your search.
+
+== SearchForFiles ==
+Search for files
+
+== EnterFileName ==
+Enter file name
+
+== Searching ==
+Searching
+
+== IncludePrivateFiles ==
+Include private files
+
+== IncludePrivateFilesAmp ==
+Include &private files
+
+== NoMatchesFound ==
+No matches found
+
+== MatchesCountSingular ==
+1 match
+
+== MatchesCountPlural ==
+{0} matches
+
+== ContainerFolderColumn ==
+Container folder
+
+== CheckinComment ==
+Introduce your checkin comment here
+
+== BrowseForFolderTitle ==
+Browse for folder
+
+== BrowseForSaveFileTitle ==
+Save file
+
+== NoValidWorkspace ==
+You didn't specify a valid workspace path {0}
+
+== FillFieldsConfiguration ==
+Please fill the following fields to configure Plastic SCM
+
+== FillFieldsConfigurationCloudEdition1 ==
+Please enter the user and password you use to connect to Plastic Cloud (same as plasticscm.com).
+
+== FillFieldsConfigurationCloudEdition2 ==
+This way you won't be prompted again when replicating to cloud.
+
+== PlasticSCMServerLabel ==
+Enter the name/IP and port of your server:
+
+== GluonServerLabel ==
+Server:
+
+== CloudCredentialsLabel ==
+This is also the user name that will identify you each time you checkin, so choose wisely.
+
+== CredentialsLabel ==
+Configure your credentials:
+
+== WorkspacePathConfigurationLabel ==
+Workspace path:
+
+== PreferencesWindowTitle ==
+Plastic SCM Preferences - {0}
+
+== GeneralPreferences ==
+General
+
+== DiffAndMerge ==
+Diff and merge
+
+== DiffAndMergeExplanation ==
+Preferences for the Plastic SCM built-in diff and merge tool (Xmerge):
+
+== ComparisonMethodAndEncodingTitle ==
+Comparison method and encoding
+
+== MergeViewBehaviorTitle ==
+Merge view behavior
+
+== ConflictResolutionTitle ==
+Merge conflict resolution
+
+== ComparisonMethod ==
+Comparison method:
+
+== ManualConflictResolution ==
+Manual conflict resolution
+
+== ManualConflictResolutionTooltip ==
+Always launch the merge tool to review conflicts, even if all of them are automatic conflicts
+
+== AutomaticConflictResolution ==
+Automatic conflict resolution (if possible)
+
+== AutomaticConflictResolutionTooltip ==
+Launch the merge tool only when user interaction is required to resolve a conflict
+
+== MergeWithPendingChanges ==
+Allow merge with pending changes
+(disabled by default so new users don't have problems undoing merges)
+
+== OtherOptions ==
+Other options
+
+== UserProfileOptions ==
+User profile
+
+== MiscOptionsTitle ==
+Miscellaneous
+
+== SetFilesAsReadOnlyAfterUpdateOrCi ==
+Update and Checkin operations set files as read-only
+
+== CompareChangedFilesContents ==
+Check content (hash) when the file timestamp is modified
+to set it as "Changed"
+
+== CompareChangedFilesContentsTooltip ==
+This is used to established the "Changed" item status
+
+== UpdateSetsTimestamps ==
+Update operation sets repository timestamps on files
+
+== EnableSharedWorkspaces ==
+Enable shared workspaces support (Samba/WinShare)
+
+== DisplayErrorOnSameCaseFiles ==
+Display error for same file name with different case
+
+== DisplayErrorOnSameCaseFilesTooltip ==
+Applies only to Unix-like filesystems
+
+== DefaultWorkspaceRoot ==
+Default Workspace root:
+
+== CommandHelpDialogTitle ==
+Command help
+
+== MergeToolsConfiguration ==
+Merge tools
+
+== DiffToolsConfiguration ==
+Diff tools
+
+== DiffToolsTableTitle ==
+Configure a diff tool for different file types and extensions. The rules are applied in the order below, top to bottom.
+
+== DiffToolsExplanation ==
+Select a file type or extension and enter the command to run the diff tool:
+
+== DiffToolsCommandHelp ==
+You can use the following command-line parameters when invoking the external diff tool.
+            You must ensure that the specified files have the actual revision contents to be compared.
+    
+            @sourcefile: full path of file whose contents will be displayed in the panel on the left
+            @destinationfile: full path of file whose contents will be displayed in the panel on the right
+
+            @sourcesymbolic: symbolic name for the source file
+            @destinationsymbolic: symbolic name for the destination file
+
+            @sourcehash: MD5 string calculated from the source file contents
+            @destinationhash: MD5 string calculated from the destination file contents
+
+            @filetype: MIME type, used for syntax highlighting
+            @comparationmethod: comparison method used
+            @fileencoding: default file encoding to use when no encoding is detected
+
+== MergeToolsTableTitle ==
+Configure a merge tool for different file types and extensions. The rules are applied in the order below, top to bottom.
+
+== MergeToolsExplanation ==
+Select a file type or extension and enter the command to run the merge tool:
+
+== MergeToolsCommandHelp ==
+The following variables are available to use as arguments when invoking the external merge tool in the command line:
+  
+            @sourcefile: full path of the source merge file  
+            @destinationfile: path of the destination merge file
+            @basefile: path of the common ancestor merge file
+            @output: path of the merge result file
+
+            @sourcesymbolic: symbolic name for the source file
+            @destinationsymbolic: symbolic name for the destination file
+            @basesymbolic: symbolic name for the base file
+
+            @sourcehash: MD5 string calculated from the source file contents
+            @destinationhash: MD5 string calculated from the destination file contents
+            @basehash: MD5 string calculated from base file contents
+
+            @filetype: MIME type used for syntax highlight
+            @fileencoding: default file encoding to use when no encoding is detected
+            @resultencoding: result file encoding (if NONE selected, it will be calculated from contributors)
+
+            @comparationmethod: comparison method used
+            @mergetype: type of merge used
+
+            @progress: a progress string indicating the current operation, e.g. 'Merging file 3/10'
+            @extrainfofile: path of a file which contains extra information about the current merge
+
+== TypeSuffixColumn ==
+Type/Suffix
+
+== DiffCommandColumn ==
+Diff tool command line
+
+== MergeCommandColumn ==
+Merge tool command line
+
+== AddToolButton ==
+Add
+
+== RemoveToolButton ==
+Remove
+
+== FileTypeQuestion ==
+Which files should this command match?
+
+== ExtensionTooltip ==
+.extension
+
+== ExternalTool ==
+External tool:
+
+== ExternalToolNotFoundError ==
+Tool not found, please introduce a valid one
+
+== BrowseForExecutableFile ==
+Browse for executable file
+
+== CommandTooltip ==
+Type your command here
+
+== SavingConfiguration ==
+Saving configuration...
+
+== FileCorruptError ==
+The file {0} contains errors and its configuration cannot be used. Please review its contents. Error: {1}
+
+== UndoCheckoutTitle ==
+Undo checkout
+
+== UndoCheckoutQuestion ==
+Undoing the checkout of the selected items will discard any changes made to them since the last checkin. This operation can't be undone. Continue?
+
+== RenameSyncTitle ==
+Rename Sync View
+
+== RenameTitle ==
+Rename item
+
+== RenameExplanation ==
+Enter a new name for the element to be renamed
+
+== NewFileExplanation ==
+Enter a name for the new empty file to be created
+
+== NewDirectoryExplanation ==
+Enter a name for the new directory to be created
+
+== EnterValidFileName ==
+Please enter a valid file name
+
+== ConfirmActionToPerform ==
+Please confirm the action to perform
+
+== DeleteItemsOnDisk ==
+Delete items on disk
+
+== DoNotDeleteItemsOnDisk ==
+Do not delete items on disk
+
+== ExpandDetails ==
+< Details
+
+== ExpandDetailsAmp ==
+< &Details
+
+== CollapseDetails ==
+Details >
+
+== CollapseDetailsAmp ==
+&Details >
+
+== ToggleDetailsPanel ==
+Toggle details panel (F7)
+
+== ApplyLocalChange ==
+Apply local change
+
+== ApplyLocalChanges ==
+Apply local changes
+
+== UndoChange ==
+Undo change
+
+== SearchingDependencies ==
+Searching dependencies...
+
+== ApplyingDependencies ==
+Applying dependencies...
+
+== DependenciesExplanationHeader ==
+There are selected items with dependencies that need to be also included in the operation.
+
+== DependenciesExplanationText ==
+Some selected items depend on others that need to be included in the operation as well. Click "OK" to proceed with all dependent items (recommended), or cancel the operation and go back to the pending changes list to deselect the items with dependencies.
+
+
+== CheckinViewOptions ==
+Checkin view options
+
+== CheckinViewOptionsExplanation ==
+The following options let you choose which items are shown in the checkin view:
+
+== SearchForChangesOnDisk ==
+Search for changes on disk *
+
+== Canceling ==
+Canceling...
+
+== CancelingMerge ==
+Canceling... (wait until current merge operation finishes)
+
+== KeepLocked ==
+Keep items locked
+
+== GettingSelectedObjects ==
+Getting selected objects...
+
+== KeepLockedAmp ==
+&Keep items locked
+
+== StatusCannotMerge ==
+Cannot merge
+
+== StatusOutOfDate ==
+Out of date
+
+== StatusDeletedOnServer ==
+Deleted on server
+
+== StatusLocked ==
+Locked by '{0}'
+
+== StatusCheckedOutChanged ==
+Checked-out (changed)
+
+== StatusCheckedOutUnchanged ==
+Checked-out (unchanged)
+
+== StatusChanged ==
+Changed
+
+== StatusReplaced ==
+Replaced
+
+== StatusNotOnDisk ==
+No está en disco
+
+== StatusAdded ==
+Añadido
+
+== StatusIgnored ==
+Ignorado
+
+== UpdatingWorkspace ==
+Updating your workspace...
+
+== ApplyingConfiguration ==
+Applying configuration...
+
+== SwitchingToBranch ==
+Switching to branch {0}...
+
+== SwitchingToChangeset ==
+Switching to changeset {0}...
+
+== SwitchingToLabel ==
+Switching to label {0}...
+
+== StatusUnchanged ==
+Unchanged
+
+== StatusUnderUnresolvedXlink ==
+The xlinked cset '{0}@{1}' is not available
+
+== ConfigurationMode ==
+Configuration Mode
+
+== MovedHistoryDescription ==
+Moved from {0} to "{1}"
+
+== RemovedHistoryDescription ==
+Removed {0}
+
+== SelectProgramToLaunch ==
+Select a program to launch
+
+== SwitchWorkspace ==
+Switch workspace...
+
+== ToogleModeRequest ==
+Pending changes to apply
+
+== ToogleModeRequestMessage ==
+Your changes in Configuration Mode will be lost if you don't click Apply before switching to the Explorer mode.
+
+== WindowTitle ==
+Workspace: {0}
+
+== ItemsMenuUpdate ==
+Update
+
+== XlinkExpansionRules ==
+Branch expansion rules:
+
+== ConfigurationUnresolvedXlink ==
+The xlinked cset '{0}@{1}' is not available
+
+== WorkspacesViewTitle ==
+Workspaces
+
+== RepositoriesViewTitle ==
+Repositories
+
+== ItemsViewTitle ==
+Explorer
+
+== PendingChangesViewTitle ==
+Pending Changes
+
+== BranchExplorerViewTitle ==
+Branch Explorer
+
+== BranchExplorerMergeExplanationTitle ==
+Merge explanation for repository {0}
+
+== BranchesViewTitle ==
+Branches
+
+== ChangesetsViewTitle ==
+Changesets
+
+== LabelsViewTitle ==
+Labels
+
+== SyncViewTitle ==
+Sync Repositories
+
+== SyncViewTitleCloudEdition ==
+Sync to Cloud
+
+== ShelvesViewTitle ==
+Shelves
+
+== HistoryViewTitle ==
+History of {0}
+
+== AnnotateViewTitle ==
+Annotate of {0}
+
+== BrowseRepositoryViewTitle ==
+Browse repository - {0}
+
+== MergeViewTitle ==
+Merge
+
+== GameUIUsageTitle ==
+GameUI usage
+
+== ConfigurationModeExplanationAutomatic ==
+Directory update mode: Automatic
+
+Automatic mode is set when all the children of a directory are selected.
+Automatic means that all new files and directories will be downloaded during the update.
+
+== ConfigurationModeExplanationManual ==
+Directory update mode: Manual
+
+Manual mode is set when not all the children of a directory are selected.
+Manual means new files and directories won’t be automatically downloaded by the update.
+
+== GameUIUsageMessage ==
+
+                Usage: gameui [<options>]
+
+                options: [--configure] [--switch]
+                         [<wkOption>] [<clientconfOption>]
+                         [<serverOption>] [<cacheserverOption>]
+
+                --configure:            Shows the configuration window
+                --switch:    Forces the workspace switcher to be displayed
+
+                wkOption:               {--wk}=<path to target workspace>
+                clientconfOption:       {--clientconf}=<path to the client configuration file>
+                serverOption:           {--server}=<server spec>
+                cacheserverOption:      {--cacheserver}=<proxy server spec>
+
+== AskUpgradeText ==
+The Plastic SCM server you are connecting to is not compatible with your client.
+
+            In order to connect to this server, you need to upgrade your client installation.
+
+            Do you want to start the upgrade now?
+
+== AskUpgradeCaption ==
+Newer version available
+
+== PendingDirectoryConflictsResolvingConflictsSingular ==
+There is 1 directory conflict that must be resolved before resolving file conflicts.
+
+== PendingDirectoryConflictsResolvingConflictsPlural ==
+There are {0} directory conflicts that must be resolved before resolving file conflicts.
+
+== PendingDirectoryConflictsApplyingChangesSingular ==
+There is 1 directory conflict that must be resolved before applying changes.
+
+== PendingDirectoryConflictsApplyingChangesPlural ==
+There are {0} directory conflicts that must be resolved before applying changes.
+
+== PendingDirectoryConflictsUpdatingWorkspaceSingular ==
+There is 1 directory conflict that must be resolved before updating the workspace.
+
+== PendingDirectoryConflictsUpdatingWorkspacePlural ==
+There are {0} directory conflicts that must be resolved before updating the workspace.
+
+== CreatedByColumn ==
+Created by
+
+== AttributeMenuItemCreate ==
+Create
+
+== AttributeMenuItemEdit ==
+Editar
+
+== AttributeMenuItemDelete ==
+Eliminar
+
+== UnresolvedXlink ==
+unresolved xlink
+
+== CouldNotLoadHistory ==
+The history cannot be loaded.
+
+== UnexpectedError ==
+An unexpected error has occurred.
+
+== SaveRequest ==
+Confirm saving comments
+
+== SaveRequestMessage ==
+The comment of the current selected object has been modified. Save the changes?
+
+== ProvideDifferentWorkspaceName ==
+Please provide a different workspace name or cancel the operation.
+
+== ProvideDifferentRepositoryName ==
+Please provide a different repository name or cancel the operation.
+
+== ProvideDifferentItemName ==
+Please provide a different item name or cancel the operation.
+
+== ProvideDifferentBranchName ==
+Please provide a different branch name or cancel the operation.
+
+== ProvideDifferentLabelName ==
+Please provide a different label name or cancel the operation.
+
+== ProvideDifferentSyncViewName ==
+Please provide a different sync view name or cancel the operation.
+
+== ProvideDifferentItemNameForRenameResolution ==
+Please provide a different item name.
+
+== ProvideUserName ==
+Please input an user name.
+
+== ProvidePassword ==
+Please input a password.
+
+== ReplicationSource ==
+Replication source
+
+== ReplicationDestination ==
+Replication destination
+
+== PullingProgressTitle ==
+Pulling branch {0}
+
+== PushingProgressTitle ==
+Pushing branch {0} to {1}
+
+== CurrentOfTotalReplicationProgressTitle ==
+   {0} of {1}
+
+== PullBranch ==
+Pull branch {0}
+
+== PullRemoteBranch ==
+Pull remote branch
+
+== PushBranch ==
+Push branch {0}
+
+== ReplicateButton ==
+Replicate
+
+== GenericChooseButton ==
+...
+
+== ServerEmpty ==
+The server field cannot be empty.
+
+== RepositoryEmpty ==
+The repository field cannot be empty.
+
+== BranchEmpty ==
+The branch field cannot be empty.
+
+== OperationStarting ==
+Operation starting
+
+== FetchingMetadata ==
+Fetching metadata
+
+== PushingMetadata ==
+Pushing metadata
+
+== IntroducingData ==
+Introducing data
+
+== OperationStartingFetch ==
+Operation starting fetch
+
+== CalculatingInitialChangeset ==
+Calculating initial changeset
+
+== FetchingRevisions ==
+Fetching revisions ({0})
+
+== FetchingBranches ==
+Fetching branches ({0})
+
+== FetchingItems ==
+Fetching items ({0})
+
+== FetchingLabels ==
+Fetching labels ({0})
+
+== FetchingLinks ==
+Fetching links ({0})
+
+== FetchingChildren ==
+Fetching children ({0})
+
+== FetchingChangeSets ==
+Fetching changesets ({0})
+
+== FetchingMoveRealizations ==
+Fetching move realizations ({0})
+
+== FetchingReviews ==
+Fetching reviews ({0})
+
+== FetchingAttributes ==
+Fetching attributes ({0})
+
+== FetchingACLs ==
+Fetching ACLs ({0})
+
+== FetchingReferences ==
+Fetching references ({0})
+
+== FetchingSEIDs ==
+Fetching SEIDs ({0})
+
+== FetchingFinished ==
+Sending metadata ({0})
+
+== OperationStartingPush ==
+Operation starting push
+
+== ReconcilingObjects ==
+Reconciling objects ({0})
+
+== PushingReferences ==
+Pushing references ({0} %)
+
+== ReconcilingACLs ==
+Reconciling ACLs ({0} %)
+
+== PushingBranches ==
+Pushing branches ({0} %)
+
+== PushingItems ==
+Pushing items ({0} %)
+
+== PushingLinks ==
+Pushing links ({0} %)
+
+== PushingLabels ==
+Pushing labels ({0} %)
+
+== PushingAttributes ==
+Pushing attributes ({0} %)
+
+== ProcessingBranches ==
+Processing branches ({0} %)
+
+== PushingChangeSets ==
+Pushing changeSets ({0} %)
+
+== PushingRevisions ==
+Pushing revisions ({0} %)
+
+== PushingMoveRealizations ==
+Pushing move realizations ({0} %)
+
+== PushingTrees ==
+Pushing trees ({0} %)
+
+== PushingACLs ==
+Pushing ACLs ({0} %)
+
+== PushingFinished ==
+Pushing finished
+
+== IntroducingDataProgress ==
+Introducing data ({0} %)
+
+== DataWritten ==
+Data written
+
+== OperationAbandoned ==
+Operation abandoned
+
+== OperationFinished ==
+Operation finished
+
+== ReplicationError ==
+An error occurred during the replica: {0}
+
+== UnknownStatus ==
+Unknown status
+
+== RetryReplicaButton ==
+Retry
+
+== SkipReplicaButton ==
+Skip
+
+== SourceReplicationServer ==
+Source server
+
+== SourceReplicationRepository ==
+Source repository
+
+== SourceReplicationBranch ==
+Source branch
+
+== DestinationReplicationServer ==
+Destination server
+
+== DestinationReplicationRepository ==
+Destination repository
+
+== CreateWorkspaceButton ==
+Create a new workspace...
+
+== MenuAddToIgnoreList ==
+Add to ignored list
+
+== MenuRemoveFromIgnoreList ==
+Remove from ignored list
+
+== MenuAddToCloakedList ==
+Add to cloaked list
+
+== MenuRemoveFromCloakedList ==
+Remove from cloaked list
+
+== MenuAddToHiddenChangesList ==
+Add to hidden changes list
+
+== MenuRemoveFromHiddenChangesList ==
+Remove from hidden changes list
+
+== UsingItemExtension ==
+Using the item extension
+
+== UsingItemFullPath ==
+Using the item full path
+
+== UsingItemName ==
+Using the item name
+
+== FilterRulesConfirmationTitle ==
+Filter rules confirmation
+
+== FilterRulesConfirmationAddMessage ==
+The following rules will be added to the configuration file. Continue?
+
+== FilterRulesConfirmationRemoveMessage ==
+The following rules will be removed from the configuration file. Continue?
+
+== FilterRulesConfirmationMessage ==
+The following rules will be added or removed from the configuration file. Continue?
+
+== ApplyRulesToAllWorkspaceCheckButton ==
+Apply rules to all workspaces
+
+== ShelveWithPendingMergeLinksRequest ==
+Shelve with pending merge links
+
+== ShelveWithPendingMergeLinksRequestMessage ==
+You have pending merge links in the workspace. The shelve operation doesn't shelve pending merge links. Do you want to shelve anyway?
+
+== UndoChangesAfterShelveRequest ==
+Undo changes after shelve
+
+== UndoChangesAfterShelveRequestMessage ==
+Your changes have been checked into a temporary changeset (shelve). These changes can be applied now to any branch. Do you want to undo these changes in the workspace?
+
+== ShelveCreatedMessage ==
+Your pending changes have been shelved to: {0}
+
+== NewCertificateTitle ==
+Server SSL certificate is not in the store
+
+== NewCertificateMessage ==
+The server you are connecting to has sent a certificate which is not in the store. This is normal if it is the first time you connect to this server. 
+
+            Certificate details:.
+            - Issued to: {0}
+            - Issued by: {1}
+            - Expiration date: {3}
+            - Certificate hash: {5}
+
+            If you trust this host, hit "Yes" to add the key to the Plastic SCM key store (recommended if it is the first time you connect to this server). 
+            If you want to carry on connecting just once, without adding the key to the store, hit "No". 
+            If you do not trust this host, hit "Cancel" to abandon the connection.
+
+== ExistingCertificateChangedTitle ==
+Server certificate has changed!
+
+== ExistingCertificateChangedMessage ==
+WARNING: this host certificate does NOT match the one you have in the key store. It may mean that the server identity has been compromised or a man-in-the-middle attack is being performed on you. 
+
+            Certificate details:
+            - Issued to: {0}
+            - Issued by: {1}
+            - Expiration date: {3}
+            - Certificate hash: {5}
+
+            If you were expecting this change and trust the new certificate, hit "Yes" to add the key to the Plastic SCM key store and trust this certificate in the future. 
+            If you want to carry on connecting just once, without adding the key to the store, hit "No". 
+            If you want to abandon this connection, hit "Cancel". This is the ONLY guaranteed safe choice.
+
+== InvalidCertificateHostnameTitle ==
+Hostname mismatch in secure connection
+
+== InvalidCertificateHostnameMessage ==
+WARNING: the hostname provided in the server certificate does NOT match the server hostname. This means that the certificate was not issued to this hostname or that there is a network configuration problem with this host. 
+
+            - Certificate hostname: {0}
+            - Server hostname: {1}
+
+            If you want to continue connecting to this host, choose "Yes". The certificate validation will continue (not recommended). 
+            If you want to abandon the connection, choose "No" (recommended).
+
+== PreviousContent ==
+previous content
+
+== RevisionsOnChangeset ==
+revisions on cs:{0}
+
+== RepositoryExplorerServerLabel ==
+Server:
+
+== UndeleteButton ==
+Undelete
+
+== UndeleteButtonTooltip ==
+Use it to recover deleted files
+
+== UndeleteViewTitle ==
+Deleted items
+
+== UndeleteMenuItemUndeleteRevision ==
+Undelete revision
+
+== UndeleteMenuItemUndeleteRevisionToThisPath ==
+Undelete revision to this path...
+
+== UndeletingItem ==
+Undeleting item...
+
+== UndeletingItemsSingular ==
+Undeleting 1 item...
+
+== UndeletingItemsPlural ==
+Undeleting {0} items...
+
+== EnterRestorePathFormTitle ==
+Undelete item
+
+== EnterRestorePathFormParentDoesNotExistExplanation ==
+The parent directory of the item does not exist, please enter a new location
+
+== EnterRestorePathFormIsPathAlreadyUsedExplanation ==
+There is already an item in the same path, please enter a new location
+
+== EnterRestorePathFormTextBoxExplanation ==
+Enter the restore path for the element to be undeleted
+
+== EnterRestorePathFormLabel ==
+Path:
+
+== EnterValidRestorePath ==
+Please enter a valid workspace path
+
+== RestorePathShouldNotExist ==
+The restore path should not exist
+
+== RestorePathParentShouldExist ==
+The parent directory of the restore path should exist
+
+== DeletedItemsOwner ==
+Owner:
+
+== DeletedItemsSince ==
+Since:
+
+== MeOwnerOption ==
+me
+
+== EveryoneOwnerOption ==
+everyone
+
+== UndeleteFindButton ==
+Find
+
+== UndeleteToPathButton ==
+Undelete...
+
+== ItemUndeletedCorrectly ==
+Undeleted ok: '{0}'
+
+== ItemCannotBeUndeleted ==
+Item '{0}' (ID: {1}) could not be undeleted because it was not found in its parent directory revision (ID: {2})
+
+== CheckinViewTitle ==
+Checkin changes
+
+== UserDefinedSyncView ==
+User defined sync view:
+
+== AddSyncViewButton ==
+Add
+
+== RenameSyncViewButton ==
+Rename
+
+== DeleteSyncViewButton ==
+Delete
+
+== SyncViewDetailsTitle ==
+Sync view details
+
+== AddSrcSyncViewRepoButton ==
+Add src repo
+
+== DeleteSrcSyncViewRepoButton ==
+Delete src repo
+
+== AddDstSyncViewRepoButton ==
+Add dst repo
+
+== DeleteDstSyncViewRepoButton ==
+Delete dst repo
+
+== PushVisibleButton ==
+Push visible
+
+== PushVisibleButtonTooltip ==
+Push all visible outgoing branches
+
+== PullVisibleButton ==
+Pull visible
+
+== PullVisibleButtonTooltip ==
+Pull all visible incoming branches
+
+== ShowExcludedBranchesCheckButton ==
+Show excluded branches
+
+== NewSyncView ==
+New sync view
+
+== NewSyncViewName ==
+Sync view name
+
+== NewSyncViewTitle ==
+Create a new Sync View to push/pull groups of branches
+
+== NewSyncViewTitleCloud ==
+Create a new Sync View to push/pull groups of branches to Plastic Cloud
+
+== NewSyncViewExplanation ==
+Instead of pushing/pulling one by one, with Sync Views you can easily replicate branches in batches
+
+== NewSyncViewCheckingRepositories ==
+Checking repositories...
+
+== NewSyncViewNoSourceRepository ==
+There is no {0} repository to use as source
+
+== NewSyncViewNoDestinationRepository ==
+There is no {0} repository to use as destination
+
+== NewSyncViewSourceRepository ==
+Source repository
+
+== NewSyncViewDestinationRepository ==
+Destination repository
+
+== NewSyncViewEnterSyncViewName ==
+Please enter a sync view name
+
+== NewSyncViewEnterRepositorySpec ==
+Please enter a repository spec
+
+== NewSyncViewInvalidRepositorySpec ==
+Invalid repository spec: {0}
+
+== NewSyncViewCheckingSourceRepositoryExists ==
+Checking source repository exists...
+
+== NewSyncViewCheckingDestinationRepositoryExists ==
+Checking destination repository exists...
+
+== NewSyncViewSourceRepositoryNotExist ==
+Source repository {0} does not exist
+
+== NewSyncViewDestinationRepositoryNotExist ==
+Destination repository {0} does not exist
+
+== NewSyncViewCreateSyncView ==
+Create new sync view (push/pull)
+
+== NewSyncViewCreatingRepository ==
+Creating repository...
+
+== SyncStatusLoading ==
+Loading...
+
+== SyncStatusUpToDate ==
+All branches are up to date
+
+== SyncStatusError ==
+Error: {0}
+
+== OutgoingBranchesSingular ==
+Outgoing branches - 1 branch
+
+== OutgoingBranchesPlural ==
+Outgoing branches - {0} branches
+
+== IncomingBranchesSingular ==
+Incoming branches - 1 branch
+
+== IncomingBranchesPlural ==
+Incoming branches - {0} branches
+
+== ExcludedBranchesSingular ==
+Excluded branches - 1 branch
+
+== ExcludedBranchesPlural ==
+Excluded branches - {0} branches
+
+== SyncMenuItemSyncAllMenuItem ==
+Synchronize all
+
+== SyncMenuItemPushAllMenuItem ==
+Push all outgoing branches
+
+== SyncMenuItemPullAllMenuItem ==
+Pull all incoming branches
+
+== SyncMenuItemRefreshReplicationTarget ==
+Refresh
+
+== SyncMenuItemPushBranch ==
+Push branch
+
+== SyncMenuItemPullBranch ==
+Pull branch
+
+== SyncMenuItemExcludeBranch ==
+Exclude branches
+
+== SyncMenuItemIncludeBranch ==
+Include branches
+
+== CantShowBinaryContent ==
+This file is detected as binary. Can't show file content, the file metadata is displayed instead. You can right click it and use "Open" to see its content. Check the online doc for more info.
+
+== CantShowBinaryDiff ==
+This file is detected as binary. No diffs are calculated, the file metadata is displayed instead. You can right click it and use "Diff" to launch an external diff viewer (must be configured). Check the online doc for more info.
+
+== Content ==
+Content of {0}
+
+== NoContent ==
+No content/differences available.
+
+== UpdateMergeExplanation ==
+New changesets have been detected in the repository, you can update to/merge from the latest changeset
+
+== ViewNewChangesButton ==
+View new changes
+
+== RetrievingBranchHeads ==
+Retrieving branch heads...
+
+== RetrievingNewChanges ==
+Retrieving new changes...
+
+== CouldNotLoadNewChanges ==
+Unable to load new changes.
+
+== RetrievingObjectInfo ==
+Retrieving object info...
+
+== WorkspaceRevisionKey ==
+Revisión del workspace
+
+== MergeToDiffWithDst ==
+Revisión en la rama destino
+
+== EncryptionConfiguration ==
+Server encryption
+
+== RetypePassword ==
+Retype Password:
+
+== EncryptionConfigurationExplanation ==
+The server '{0}' requires data encryption.
+            Your client is not yet configured to handle encrypted data from '{0}'
+
+== EncryptionConfigurationEnterPassword ==
+Enter a password to generate the encryption key:
+
+== EncryptionConfigurationRemarks ==
+Remarks:
+            * Be very careful with the encryption password: it's the only way to decrypt your data on server '{0}'.
+            * If you're decrypting data and you enter a wrong password, data will fail to decrypt and you will have to edit cryptedservers.conf on your client to fix it.
+            * Be careful to use the same password (encryption key) company-wide to work with '{0}'. Otherwise, data will be encrypted differently in each client.
+
+== InvalidEmptyPassword ==
+Password cannot be empty
+
+== PasswordDoesntMatch ==
+Passwords don't match
+
+== ApplyActionForNextConflictsCheckButtonSingular ==
+Apply this action for the next 1 conflict.
+
+== ApplyActionForNextConflictsCheckButtonPlural ==
+Apply this action for the next {0} conflicts.
+
+== SourceHeaderButton ==
+Select Source: '{0}'
+
+== BaseHeaderButton ==
+Select Base: '{0}'
+
+== DestinationHeaderButton ==
+Select Destination: '{0}'
+
+== SourceHeaderButtonTooltip ==
+(Ctrl+1)
+
+== BaseHeaderButtonTooltip ==
+(Ctrl+2)
+
+== DestinationHeaderButtonTooltip ==
+(Ctrl+3)
+
+== PendingUnsolvedConflicts ==
+The file still has {0} unsolved conflicts.
+
+== FileChangedSinceSaved ==
+The file has been changed since it was last saved.
+
+== SaveAndExitButton ==
+save & exit
+
+== ExitWithoutSavingButton ==
+exit without saving
+
+== AutomaticConflictMarkup ==
+Current conflict is <span foreground='green'>automatic</span>. No user intervention is required.
+
+== NonAutomaticConflictMarkup ==
+Current conflict is <span foreground='red'>non-automatic</span>. Resolve it by clicking the buttons above, editing the result file or marking it as resolved.
+
+== NonAutomaticConflictMarkedAsResolvedMarkup ==
+Current conflict is <span foreground='green'>non-automatic</span>, and it has been already <span foreground='green'>resolved</span> by the user.
+
+== MarkAsResolvedButton ==
+Mark as resolved
+
+== MarkAsUnResolvedButton ==
+Mark as unresolved
+
+== GtkMergetoolUsageTitle ==
+Mergetool usage
+
+== GtkMergetoolUsage ==
+
+                Usage: gtkmergetool <mergeoptions>
+
+                mergeOptions: <sourceFile> [<sourceSymbolicName>] 
+                              <baseFile> [<baseSymbolicName>]
+                              <destinationfile> [<destinationSymbolicName>]
+                              [[<autosave>] <resultFile>]
+                              [<mergeType>]
+                              [<generalOptions>]
+
+                    sourceFile:              {-s | --source}=<filename>
+                    sourceSymbolicName:      {-sn | --srcsymbolicname}=<symbolicname>
+                    baseFile:                {-b | --base}=<filename> 
+                    baseSymbolicName:        {-bn | --basesymbolicname}=<symbolicname>
+                    destinationFile:         {-d | --destination}=<filename>; 
+                    destinationSymbolicName: {-dn | --dstsymbolicname}=<symbolicname>
+                    autosave:                -as | --autosave
+                    resultFile:              {-r | --result}=<filename>
+                    mergeType:               {-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced}
+        
+
+                generalOptions: [<defaultEncoding>] [<comparisonMethod>] [<resultEncoding>]
+
+                    defaultEncoding:     {-e | --encoding}={none |ascii | unicode | bigendian | utf7 | utf8}
+                    resultEncoding:      {-re | --resultencoding}={none |ascii | unicode | bigendian | utf7 | utf8}
+                    comparisonMethod:    {-i | --ignore}={none | eol | whitespaces | eol&amp;whitespaces}
+
+== FsProtectionChanged ==
+Filesystem permissions changed from {0} to {1}.
+
+== CreateXlinkTitle ==
+Create Xlink
+
+== CreateXlinkExplanation ==
+An Xlink is a directory that links to a changeset on a different repository. It's the way to load several repositories on a workspace.
+
+== XlinkTargetServerEntry ==
+Target server, choose or type one
+
+== XlinkTargetServerExplanation ==
+server:port format, i.e: myserver:8087
+
+== XlinkTargetRepositoryEntry ==
+Target repository
+
+== XlinkTargetChangesetEntry ==
+Target changeset
+
+== XlinkNameEntry ==
+Xlink name (name of the directory entry)
+
+== XlinkHint ==
+Remember that the xlinked contents will not be downloaded until you checkin the xlink and update your workspace
+
+== SelectARepository ==
+You need to select a repository before selecting a changeset inside it
+
+== MainMainRuleCreated ==
+You're creating a XLink to the main branch at the target repository.
+            Most likely you're looking to link main branches between the two repositories, so an expansion rule will be created for that matter.
+            If this layout is not what you expected, please edit the expansion rules manually.
+
+== XlinkOptions ==
+Xlink options
+
+== WritableXlinkCheckButton ==
+Writable (otherwise this part of the code tree will be readonly)
+
+== RelativeServerCheckButton ==
+Use relative server - the Xlink tries to get its repository from the local server (recommended if repositories are replicated)
+
+== BranchExpansionRules ==
+Branch expansion rules
+
+== BranchExpansionRulesExplanation ==
+These rules define how source and destination branches are linked. For writable Xlinks you can define a link between main@src and main/fix@dst.
+
+== SelectARepositoryForRule ==
+You need to select a repository before creating a rule
+
+== AddExpansionRuleTitle ==
+Add expansion rule
+
+== AddExpansionRuleExplanation ==
+Define how the branches are expanded between xlinked repositories
+
+== SourceBranch ==
+Source branch
+
+== DestinationBranch ==
+Destination branch
+
+== IsDefinedByUser ==
+Is defined by user
+
+== Yes ==
+Yes
+
+== No ==
+No
+
+== AlreadyDefinedRuleForBranch ==
+You have already defined a rule for this source branch
+
+== XlinkNoChangesetSelected ==
+No changeset has been selected as the target of the Xlink
+
+== EmptyXlinkName ==
+The Xlink directory name is empty
+
+== NoRulesDefined ==
+You have not defined branch expansion rules for this xlink, are you sure you want to continue?
+
+== NoRulesDefinedCaption ==
+No rules defined
+
+== EditXlinkTitle ==
+Edit Xlink
+
+== EditButton ==
+Edit
+
+== EmptySourceBranch ==
+The source branch field cannot be empty.
+
+== EmptyDestinationBranch ==
+The destination branch field cannot be empty.
+
+== LoadingXlinkData ==
+Loading xlink data...
+
+== CreatingDefaultRule ==
+Creating default rule...
+
+== NoContentToCompare ==
+There is no content to compare.
+
+== CreateBranchManualMode ==
+Manual
+
+== CreateBranchTaskMode ==
+From task
+
+== LoadingIssueTrackerExtension ==
+Loading issue tracker extension...
+
+== MarkingTaskAsOpen ==
+Marking '{0}' task as open in '{1}'
+
+== PendingTasks ==
+Pending tasks
+
+== RetrievingTasks ==
+Retrieving pending tasks...
+
+== RetrievingUserTasks ==
+Retrieving pending tasks for user '{0}'...
+
+== DisplayPendingTasksFromAllUsers ==
+Display pending tasks from all users
+
+== MarkAsOpenInIssueTracker ==
+Mark as open in issue tracker
+
+== LinkedTasksViewTitle ==
+Linked tasks
+
+== PlasticTaskIdProperty ==
+ID:
+
+== PlasticTaskOwnerProperty ==
+Owner:
+
+== PlasticTaskStatusProperty ==
+Status:
+
+== PlasticTaskTitleProperty ==
+Title:
+
+== PlasticTaskDescriptionProperty ==
+Description:
+
+== MarkAsOpenTaskTooltip ==
+The task will be marked as open in the issue tracker
+
+== DeleteTaskTooltip ==
+Delete this issue
+
+== LoadingLinkedTasks ==
+Loading tasks to be linked in the issue tracker...
+
+== AddTaskTooltip ==
+Add new issue
+
+== SelectTasksToBeLinkedDialogTitle ==
+Select issues from {0}
+
+== SelectTasksToBeLinkedTitle ==
+Select issues
+
+== SelectTasksToBeLinkedExplanation ==
+Choose issues to be linked to the new changeset
+
+== TaskIdEntryTitle ==
+Issue IDs:
+
+== ManualTaskIdEntryExplanation ==
+You can manually enter a comma-separated issue ID list if you can't find yours above
+
+== UnknownTaskIdsInManualEntry ==
+Invalid issue IDs were found in the manual entry field.
+
+== OpenTaskInBrowserTooltip ==
+Open task info page in web browser
+
+== DoNotCheckinChangesJustMove ==
+Do not checkin the changes, just move them to the specified branch.
+
+== CreateANewBrachRadioButton ==
+Create a new branch
+
+== CreateANewBranchToCheckinExplanationLabel ==
+Create a child branch of {0} and checking your workspace changes to that branch.
+
+== CreateANewBranchToMoveChangesetExplanationLabel ==
+Create a child branch of {0} to move changeset cs:{1}.
+
+== CreateANewBranchLabel ==
+Name for child branch
+
+== SelectExistingBranchRadioButton ==
+Select an existing branch (must be empty)
+
+== SelectExistingBranchExplanationLabel1 ==
+Select a previously created branch and checkin your workspaces changes to that branch.
+
+== SelectExistingBranchExplanationLabel2 ==
+The branch base of the selected branch will be changed to be your current base
+
+== SelectExistingBranchToMoveExplanationLabel ==
+Select a previously created branch and move the selected changesets inside it.
+
+== SelectExistingBranchLabel ==
+Selected branch
+
+== MoveChangesNoBranchName ==
+Please specify a child branch name
+
+== MoveChangesSelectABranch ==
+Please select a branch
+
+== MoveChangesBranchMustBeEmpty ==
+The selected branch must be empty
+
+== CantUpdateBraseChangesetBranchWithRevisions ==
+Can't update base changeset for branch because it must be empty
+
+== RetrievingWorskpaceInfo ==
+Retrieving workspace info
+
+== MovingChangesToTargetBranch ==
+Moving changes to target branch...
+
+== UpdatingTargetBranchBase ==
+Updating target branch base...
+
+== CreateCloudEditionTip ==
+If you don't have a Cloud Edition account yet [[BUY_CLOUD|click here]] to create one
+
+== OrganizationUserBelongsTo ==
+Your organization is {0}
+
+== OrganizationNotFoundLine1 ==
+It seems you don't have an organization for {0}
+
+== OrganizationNotFoundLine2 ==
+[[BUY_CLOUD|Click here]]  to create one
+
+== PurchaseCloudEditionURL ==
+https://www.plasticscm.com/plasticscm-cloud-edition/index.html?utm_source=gluon&utm_medium=app&utm_campaign=startup
+
+== NameWorkingMode ==
+User name from the computer
+
+== NameIdWorkingMode ==
+Name + user ID
+
+== ADWorkingMode ==
+Active Directory
+
+== LDAPWorkingMode ==
+LDAP
+
+== UPWorkingMode ==
+Built-in user and password
+
+== TubeWorkingMode ==
+Tube Working Mode
+
+== SSOWorkingMode ==
+Single Sign On
+
+== BuyCloudEdition ==
+If you don't have a Cloud Edition account yet, click {0} to create one.
+
+== BuyCloudEditionClickablePart ==
+here
+
+== RepositoryWillBeKnownAs ==
+Will be known as {0}
+
+== CantCreateLocalRepository ==
+Can't create local repository
+
+== CantCreateCloudRepository ==
+Can't create cloud repository
+
+== CantCreateWorkspace ==
+Can't create workspace
+
+== CantCreateSyncView ==
+Can't create sync view
+
+== CantRetrieveCloudOrganization ==
+Can't retrieve your cloud organization
+
+== SyncViewNameAlreadyExists ==
+Sync view {0} already exist
+
+== StartANewProject ==
+Start a new project
+
+== Distributed ==
+Distributed
+
+== JoinExistingProject ==
+Join an existing project
+
+== Centralized ==
+Centralized
+
+== WelcomeToCloudEdition ==
+Welcome to Plastic SCM Cloud Edition
+
+== WelcomeToPlasticSCM ==
+Welcome to Plastic SCM
+
+== WelcomeToGluonTeamEdition ==
+Welcome to Gluon
+
+== WelcomeToGluonCloudEdition ==
+Welcome to Gluon - Cloud Edition
+
+== TeamEditionFirstSteps1stCaption ==
+You will be working on your local workspaces connected to your Plastic SCM server
+
+== TeamEditionFirstSteps2ndCaption ==
+You can create different repositories for different projects, and normally one workspace for each repository
+
+== CloudEditionFirstSteps1stCaption ==
+You can work centralized or distributed
+
+== CloudEditionFirstSteps2ndCaption ==
+Centralized means no local repo
+
+== CloudEditionFirstStepsChooseOption ==
+Please choose one path to start working with Plastic Cloud
+
+== TeamEditionFirstStepsChooseOption ==
+Please choose any of the following options to start working with Plastic SCM
+
+== TeamEditionFirstStepsJoinExistingProjectExplanation ==
+Just select an existing repository on your Plastic SCM server and create a new workspace to download it
+
+== CloudEditionFirstStepsNewCloudRepositoryExplanation ==
+To create a new Cloud Edition project let's first create a repository in Plastic Cloud, and a local one to checkin the changes before pushing to Cloud
+
+== CloudRepository ==
+Cloud repository
+
+== LocalRepositoryName ==
+Local repository name
+
+== NewRepositoryName ==
+New repository name
+
+== WorkspaceName ==
+Workspace name
+
+== PathOnDisk ==
+Path on disk. The place where your files will be on your disk. If you already have a project on disk, you can select the existing path
+
+== MakeWorkspaceDynamic ==
+Make this workspace dynamic
+
+== CreateSyncViewToPushPullCloud ==
+Create a Sync View to push/pull changes to Cloud
+
+== BrowseButton ==
+Browse...
+
+== PerformingRequestedOperations ==
+Performing requested operations...
+
+== CheckingCloudRepositoryAvailable ==
+Checking cloud repository name is available...
+
+== CheckingLocalRepositoryAvailable ==
+Checking cloud repository name is available...
+
+== CheckingWorkspaceAvailable ==
+Checking workspace is available...
+
+== CheckingSyncViewNameAvailable ==
+Checking sync view name is available...
+
+== CreatingCloudRepository ==
+Creating repository {0}@cloud...
+
+== CreatingLocalRepository ==
+Creating repository {0}@local...
+
+== CreatingSyncView ==
+Creating sync view...
+
+== CloudEditionFirstStepsDistributedExplanation ==
+This is the Git way of working, with a local repo and push/pull to the Cloud one
+
+== CloudRepositoryDoNotExist ==
+The repository {0} does not exist on your cloud organization
+
+== CheckingCloudRepositoryExists ==
+Checking cloud repository exists...
+
+== CloudEditionFirstStepsCreateWorkspaceExplanation ==
+Just your workspace connected to the cloud repo. If you are not sure, then this is your option
+
+== NoRepositoriesFound ==
+No repositories found. Check that your Plastic SCM server is running and that there are repositories on it
+
+== CloudRepositories ==
+Cloud repositories
+
+== SyncFromLocalToCloudViewName ==
+Sync {0} from local to cloud
+
+== SyncToRepository ==
+Sync to {0}
+
+== SyncFromRepository ==
+Sync from {0}
+
+== LocalServerDetected ==
+Local server {0} detected
+
+== LocalServerDetectedDvcsMode ==
+Local server detected
+
+== UseSsl ==
+Use SSL
+
+== TeamEditionFirstStepsJoinTeamExplanation ==
+To start a new project you can create a new repository on your Plastic SCM server
+
+== ConfirmDeleteChangesetCaption ==
+Confirm changeset delete
+
+== DeleteChangesetWarning ==
+Are you sure you want to delete the changeset:
+{0}?
+
+== CantDeleteChangesetCaption ==
+Unable to delete the changeset
+
+== CantDeleteChangeset ==
+The current changeset cannot be deleted because it is referenced by another item.
+
+Check that:
+ * The changeset is not the source of a merge link
+ * The changeset has no children
+ * The changeset is not labelled
+ * No shelvesets were created from the changeset
+
+Note, you can find shelvesets created from a given changeset by running the following query from the cli or Shelves view:
+
+    find shelve where parent=changesetspec
+
+== DeleteWorkingChangesetCaption ==
+Delete working changeset
+
+== DeleteWorkingChangeset ==
+Deleting the changeset you are changing your workspace configuration. Continue?
+
+== CannotDeleteCsetWithPendingChanges ==
+Cannot delete the selected changeset since there are pending changes. Please review the pending changes and retry the operation.
+
+== CannotMoveCsetWithPendingChanges ==
+Cannot move the selected changeset since there are pending changes. Please review the pending changes and retry the operation.
+
+== ReportChanged ==
+Changed items
+
+== ReportAdded ==
+Added items
+
+== ReportDeleted ==
+Deleted items
+
+== ReportMoved ==
+Moved items
+
+== ReportLoaded ==
+Loaded items
+
+== ReportUnloaded ==
+Unloaded items
+
+== ShowUpdateReportButton ==
+Show update report
+
+== ClearReportButton ==
+Clear report
+
+== HideUpdateReportButton ==
+Hide update report
+
+== ReportUpdatedHeader ==
+Updated
+
+== ConfigurationAppliedHeader ==
+Configuration applied
+
+== ZoomIn ==
+Zoom in
+
+== ZoomOut ==
+Zoom out
+
+== RemoveFilter ==
+Remove filter
+
+== SelectedBranchesAndRelated ==
+{0} and related branches
+
+== SelectedBranchesAndPendingMerges ==
+{0} and pending merges
+
+== DownloadingRevisions ==
+Downloading revisions...
+
+== GoToSourceChangesetMenuItem ==
+Go to source changeset
+
+== GoToDestinationChangesetMenuItem ==
+Go to destination changeset
+
+== Name ==
+Name:
+
+== NewName ==
+New name:
+
+== NoCsetCreatedWarning ==
+A new changeset was not created because file data did not change
+
+== AllFileConflictsWereMergedWarning ==
+All files merged and are ready for checkin
+
+== SomeFileConflictsWereMergedWarning ==
+Only some files were merged and are ready for checkin
+
+== NoFileConflictsWereMergedWarning ==
+No files were merged
+
+== SaveDiffChangesTitle ==
+Do you want to save the changes you made to the current file?
+
+== SaveDiffChangesMessage ==
+Your changes will be lost if you don't save them
+
+== DontSaveButton ==
+Don't save
+
+== SelectFileToSeeDifferences ==
+Select a file to see its differences
+
+== SaveThisRevisionAs ==
+Save this revision as...
+
+== SaveRevisionAs ==
+Save revision as...
+
+== SavingRevision ==
+Saving revision to '{0}'...
+
+== DownloadFilesProgress ==
+Downloaded {0} of {1} ({2} of {3} files to download)
+
+== DownloadInfoSingular ==
+Will download 1 file {0}
+
+== DownloadInfoPlural ==
+Will download {0} files {1}
+
+== NotifyLinuxWatchLimitWarning ==
+The maximum number of watched items was reached. You can increase its value executing 'sudo sysctl fs.inotify.max_user_watches=524288'
+
+== CheckinProgressMultiThreadUploading ==
+Multi-thread checkin
+
+== CheckinProgressMultiThreadNumOfBlocks ==
+uploading {0} blocks in parallel
+
+== SkipDiffMergeTracking ==
+Skip merge tracking
+
+== SkipDiffMergeTrackingTooltip ==
+Do not group file changes by merge source. Each file is displayed once, with its 'total' changes.
+
+== FetchNoDataCheckButton ==
+Do not replicate data (you need to be the admin of your server)
+
+== FetchNoDataNoPermissions ==
+You need to be the administrator of the destination server in order to use the 'do not replicate data' option.
+
+== CheckingFetchNoDataNoPermissions ==
+Checking permissions...
+
+== CheckinProgressUploadingFiles ==
+Uploading {0} files
+
+== CheckinProgressUploadingFileData ==
+Uploading file {0} ({1}) to the repository
+
+== CheckinProgressOf ==
+of
+
+== ToggleDetails ==
+Toggle details
+
+== ShowDetails ==
+Show details
+
+== HideDetails ==
+Hide details
+
+== ToggleDetailsButtonTooltip ==
+Hide/show details area
+
+== NoDiffToolDefined ==
+There aren't any diff tools defined in the client configuration file
+
+== FileProperties ==
+File properties
+
+== FileHistory ==
+File history
+
+== Comment ==
+Comment
+
+== OpenButton ==
+Open
+
+== StatusAtWorkspace ==
+{0} at {1} workspace
+
+== UnsupportedBinaryType ==
+Unsupported file type for binary diff.
+
+== ApplyAttributesButton ==
+Apply attributes...
+
+== ApplyAttribute ==
+Apply an attribute to the selected object
+
+== ApplyAttributeExplanation ==
+Select the attribute type to apply in the "Attribute" dropdown list; the "Value" field lets you choose an existing value from the drop down list or type a new value.
+
+== AttributeLabel ==
+Attribute:
+
+== AttributeValueLabel ==
+Value:
+
+== LoadingAttributes ==
+Loading attributes...
+
+== LoadingAttributeValues ==
+Loading attribute values...
+
+== SelectAttribute ==
+Select an attribute
+
+== SelectAttributeValue ==
+Enter an attribute value
+
+== ApplyingAttribute ==
+Applying attribute...
+
+== SettingAttributeValue ==
+Setting new value...
+
+== DeletingAttribute ==
+Deleting attribute...
+
+== AnnotateDays ==
+days
+
+== AnnotateLocalRevision ==
+local
+
+== AnnotateAuthorField ==
+Author: 
+
+== AnnotateDateField ==
+Date: 
+
+== AnnotateBranchField ==
+Branch: 
+
+== AnnotateChangesetField ==
+Changeset: 
+
+== AnnotateChangedDuringMerge ==
+Changed during merge: 
+
+== ComboBoxValuesReduced ==
+We only loaded the last 500 values. Otherwise the dropdown control takes forever to load.
+
+== CreateAttribute ==
+Create a new attribute
+
+== CreateAttributeExplanation ==
+Type a name for the new attribute. It will be created in '{0}'
+
+== AttributeNameLabel ==
+Attribute name:
+
+== AttributeCommentLabel ==
+Comments:
+
+== AttributeHelpLabel ==
+Añade una linea usando el formato 'default: value1, "value two", ..., valueN' para definir valores por defecto para este atributo.
+
+== EnterAttributeName ==
+Please enter a name
+
+== CreatingAttribute ==
+Creating attribute...
+
+== AttributeNameAlreadyExists ==
+The attribute {0} already exists ({1})
+
+== MergeToPendingFileConflicts ==
+There are pending file conflicts that must be resolved before processing the merge-to.
+
+== CommentsDialogTitle ==
+Comments
+
+== CommentsDialogExplanation ==
+Enter a comment for merge-to checkin operation:
+
+== BranchMergeTo ==
+Server side merge – from branch {0} to branch {1}
+
+== LabelMergeTo ==
+Server side merge – from label {0} to branch {1}
+
+== ChangesetMergeTo ==
+Server side merge – from changeset cs:{0} to branch {1}
+
+== CheckinMergeTo ==
+Checkin merge!
+
+== MergeBranch ==
+Merge from branch {0}
+
+== ChangesetIntervalCherryPick ==
+Cherry pick from changeset interval (cs:{0} - cs:{1}]
+
+== BranchCherryPick ==
+Cherry pick from branch {0}
+
+== ChangesetCherryPick ==
+Cherry pick from changeset cs:{0}
+
+== LabelMerge ==
+Merge from label {0}
+
+== CherrypickSubtractiveMerge ==
+Subtractive merge from changeset cs:{0}
+
+== IntervalCherrypickSubtractiveMerge ==
+Subtractive merge from changeset interval (from cs:{0} to cs:{1})
+
+== ChangesetMerge ==
+Merge from changeset cs:{0}
+
+== OverlappedMerge ==
+Update-to/merge-from latest changeset cs:{0}
+
+== SwitchBranchButton ==
+Switch branch...
+
+== SwitchBranch ==
+Switch to branch
+
+== OwnerColumn ==
+Owner
+
+== PleaseSelectBranch ==
+Please select a branch
+
+== PleaseTypeAPath ==
+Por favor, introduzca una ruta
+
+== Copy ==
+Copy
+
+== AnnotateOptions ==
+Annotate options
+
+== AnnotateDiffBranchMenuItem ==
+Diff branch {0}
+
+== AnnotateDiffChangesetMenuItem ==
+Diff changeset {0}
+
+== AnnotateParentRevisionMenuItem ==
+Annotate parent revision
+
+== AnnotateParentChangesetMenuItem ==
+Annotate before these changes (parent of cs:{0})
+
+== AnnotateShowDate ==
+Show date modified
+
+== AnnotateShowChangeset ==
+Show changeset
+
+== AnnotateShowBranch ==
+Show branch
+
+== AnnotateShowAuthor ==
+Show author
+
+== AnnotateShowLineAge ==
+Show line age
+
+== AnnotateShowRevInMerge ==
+Show whether line was changed in a merge
+
+== AnnotateDisplayShortBranchNames ==
+Display short branch names
+
+== AnnotateDisplayFullBranchNames ==
+Display full branch names
+
+== Shelve ==
+Shelve
+
+== AnnotateDialogTitle ==
+Annotate
+
+== AnnotateCantFindRevisionAtChangeset ==
+Cannot find revision in changeset cs:{0}
+
+== AnnotateNoPreviousRevision ==
+There is no previous version for this item.
+
+== AnnotateCantRunOnBinaryFiles ==
+Los ficheros binarios no se pueden anotar. Si el fichero es en realidad texto plano, se puede cambiar su tipo usando el menú contextual del Explorador de ficheros, o forzándolo a través del fichero de configuración filetypes.conf.
+
+== ChangesetsDynamicViewTitle ==
+Changesets {0}
+
+== UserProfileServerLabel ==
+Server:
+
+== UserProfileServerProfileNotFound ==
+No connection profile found for server '{0}', please configure one.
+
+== UserProfileWrongAuthMode ==
+The user profile can only be configured using Ldap or User/Password authentication.
+
+== LoadingUserProfile ==
+Loading user profile...
+
+== NoProfileToShow ==
+There is not defined profile to show
+
+== SavingUserProfile ==
+Saving user profile...
+
+== EnterValidEmailAddress ==
+Please enter a valid email address.
+
+== EnterValidIntValue ==
+Please enter a valid integer value.
+
+== UserProfileLoadError ==
+Cannot retrieve the profile from {0}. Details: {1}
+
+== UserProfileSaveError ==
+Cannot save the profile for {0}. Details: {1}
+
+== PendingChangesOptionsDialogTitle ==
+Cambios Pendientes - Opciones
+
+== PendingChangesWhatToFindTab ==
+Qué encontrar
+
+== PendingChangesWhatToShowTab ==
+Qué mostrar
+
+== PendingChangesMoveDetectionTab ==
+Detección de movidos
+
+== PendingChangesAdvancedMoveDetectionTab ==
+Detección avanzada de movidos
+
+== PendingChangesWhatToFindDialogTitle ==
+Configurar cómo encontrar cambios en el workspace
+
+== PendingChangesWhatToFindDialogExplanation ==
+Se puede ajustar en detalle cómo buscar cambios en disco y qué omitir
+
+== PendingChangesWhatToShowDialogTitle ==
+Configuración de los tipos de cambios a mostrar
+
+== PendingChangesWhatToShowDialogExplanation ==
+Desde el refresco automático hasta decidir si ver ficheros privados, ignorados y más
+
+== PendingChangesMoveDetectionDialogTitle ==
+Ajustar cómo encontrar ficheros y directorios movidos en el workspace
+
+== PendingChangesMoveDetectionDialogExplanation ==
+Puede detectar ficheros y directorios que se han movido o renombrado en disco
+
+== PendingChangesAdvancedMoveDetectionDialogTitle ==
+Se puede acelerar la detección de cambios usando NTFS journal
+
+== PendingChangesAdvancedMoveDetectionDialogExplanation ==
+Es una funcionalidad avanzada útil para realizar refactors complejos pero hay que usarla con cuidado
+
+== PendingChangesFilesystemWatcherEnabled ==
+El File System Watcher está habilitado
+
+== PendingChangesFilesystemWatcherDisabled ==
+El File System Watcher está deshabilitado
+
+== PendingChangesFilesystemWatcherEnabledExplanation ==
+Plastic monitoriza el workspace para acelerar la detección de cambiados. Esto elimina la necesidad de recorrer la estructura de directorios, aunque calcular los movidos todavía podría ser lento.
+
+== PendingChangesFilesystemWatcherDisabledExplanation ==
+Esto no es normal y puede afectar al rendimiento. Plastic monitoriza los cambios del workspace usando la API de Windows. De esta forma, no es necesario recorrer la estructura de directorios. Contacte con el equipo de soporte para obtener ayuda, a menos que esté desactivado en client.conf intencionadamente. [[HELP_URL|{0}]]
+
+== PendingChangesShowCheckouts ==
+Mostrar checkouts
+
+== PendingChangesShowCheckoutsExplanation ==
+Muestra los ficheros en checkout en Plastic, también los ficheros movidos usando las GUIs o línea de comandos. Finalmente, los ficheros involucrados en un proceso de merge. Los checkouts se muestran superrápido porque están en una lista y no es necesario recorrer la estructura de directorios para encontrarlos
+
+Consejo: Para workspaces grandes (los mayores de 800k ficheros), puede tener sentido usar sólo checkouts y no cambiados. Los checkouts también son necesarios si se usa bloqueo de ficheros
+
+== PendingChangesFindChanged ==
+Buscar ficheros cambiados en el workspace
+
+== PendingChangesFindChangedExplanation ==
+Recorre la estructura de directorios del workspace para encontrar los ficheros cambiados (fecha de modificación cambiada)
+
+== PendingChangesCheckFileContent ==
+Verifica el contenido del fichero y no sólo la fecha para marcarlo como cambiado
+
+== PendingChangesCheckFileContentExplanation ==
+Cuando la fecha de un fichero es modificada, también verifica si el hash del fichero ha cambiado. Útil con aplicaciones que guardan ficheros sin realizar ningún cambio. Advertencia: puede hacer que la vista de "cambios pendientes" sea más lenta porque requiere leer y calcular el hash de los ficheros.
+
+== PendingChangesAutoRefresh ==
+Autorefresco
+
+== PendingChangesAutoRefreshExplanation ==
+Refresca automáticamente la lista de Cambios Pendientes cuando es necesario y evita el refresco manual.
+
+== PendingChangesGroupInChangeLists ==
+Agrupa cambios en "listas de cambios"
+
+== PendingChangesGroupInChangeListsExplanation ==
+Plastic puede agrupar los cambios en el workspace en listas creadas por el usuario. Esto es útil si echa de menos la funcionalidad de otros controles de versiones anteriores (P4).
+
+== PendingChangesShowPrivateFiles ==
+Mostrar ficheros privados
+
+== PendingChangesShowPrivateFilesExplanation ==
+Lista ficheros que no están bajo el control de versiones. Pueden ser ficheros añadidos recientemente, pero a veces son ficheros generados por herramientas que es mejor ignorar. (Añadirlos a "ignorados" puede ser una mejor opción).
+
+== PendingChangesAlwaysSelectPrivateFiles ==
+Seleccionar siempre ficheros privados
+
+== PendingChangesAlwaysSelectPrivateFilesExplanation ==
+De esta forma no se olvidará nuevos ficheros al hacer checkin, pero es necesario tener un buen ignore.conf para evitar añadir accidentalmente ficheros temporales al control de versiones.
+
+== PendingChangesShowIgnoredFiles ==
+Mostrar ficheros ignorados
+
+== PendingChangesShowIgnoredFilesExplanation ==
+Muestra los ficheros ignorados anteriormente al añadirlos a ignore.conf.
+
+== PendingChangesShowHiddenFiles ==
+Mostrar ficheros ocultos
+
+== PendingChangesShowHiddenFilesExplanation ==
+Muestra los ficheros que previamente se ocultaron al añadirse a hidden_changes.conf.
+
+== PendingChangesShowDeletedFiles ==
+Mostrar ficheros y directorios eliminados
+
+== PendingChangesShowDeletedFilesExplanation ==
+Muestra los ficheros borrados manualmente en el workspace fuera del control de Plastic. (Sin usar una GUI o un comando, sino simplemente borrándolos del disco).
+
+== PendingChangesMoveDetectionExplanation ==
+Se puede mover un fichero usando Plastic con "cm mv" o desde las GUIs o el plugin de un IDE. Este método no requiere "detección". Pero, si se mueven los ficheros directamente en disco, Plastic puede detectar la operación. También se aplica a directorios.
+
+== PendingChangesFindMovedFiles ==
+Buscar ficheros y directorios movidos y renombrados
+
+== PendingChangesFindMovedFilesExplanation ==
+Recorre el workspace buscando posibles movidos. Si se renombra foo.c a bar.c, Plastic encontrará bar.c como añadido, foo.c como eliminado, e intentará hacerlos coincidir. Puede ser lento si hay muchos ficheros privados.
+
+== PendingChangesMoveDetectionFineTune ==
+Ajustar cómo funciona la detección de movidos:
+
+== PendingChangesMatchBinarySameExtension ==
+Hacer coincidir ficheros binarios sólo cuando tengan la misma extensión
+
+== PendingChangesMatchBinarySameExtensionExplanation ==
+No intenta hacer coincidir un .png con un .jpg. Pero no encontrará un .doc renombrado a .docx.
+
+== PendingChangesMatchTextSameExtension ==
+Hacer coincidir ficheros de texto sólo cuando tengan la misma extensión
+
+== PendingChangesMatchTextSameExtensionExplanation ==
+No intenta hacer coincidir un .cs con un .c. Puede ser útil en algunas circunstancias.
+
+== PendingChangesSimilarityPercentage ==
+Porcentaje de similitud
+
+== PendingChangesSimilarityPercentageExplanation ==
+Define "cómo de parecidos" deben ser dos ficheros para que sean detectados como movidos o renombrados. Si se mueve foo.c a bar.c y se modifica más adelante, el % define cómo de parecidos deben ser para que Plastic los considere el mismo fichero.
+También se aplica a los directorios: cómo de parecida debe ser la estructura del directorio: cuántos hijos movidos en relación con el total de entradas del directorio.
+Para los binarios, el % significa la diferencia de tamaño permitida.
+
+== PendingChangesEnableNTFSJournal ==
+Habilita una monitorización precisa utilizando NTFS journal
+
+== PendingChangesEnableNTFSJournalExplanation ==
+Usa el NTFS journal para detectar ficheros y directorios movidos mientras la GUI está abierta. Es superpreciso y no hay "adivinanzas" ni heurísticas. NTFS sabe cuándo se mueve un fichero o un directorio.
+
+Pero, hay un inconveniente: no es seguro usarlo si refactoriza un proyecto con herramientas como Visual Studio. Esto se debe a que VS no mueve simplemente foo.c a src/bar.c, sino que crea un nuevo src/bar.c, copia el contenido, y luego elimina foo.c. No hay forma de rastrearlo desde el sistema de ficheros.
+
+Para un gran refactor usando el Explorador de Windows o la línea de comandos, funcionará sin problemas.
+
+== PendingChangesChangeTrackerServiceNotRunning ==
+El servicio Plastic Change Tracker no se está ejecutando
+
+== PendingChangesChangeTrackerServiceNotRunningExplanation ==
+No se puede comunicar con el servicio Plastic Change Tracker. Asegúrese de que esté instalado y funcionando.
+
+== PendingChangesINotifyEnabled ==
+inotify change watcher está habilitado
+
+== PendingChangesINotifyDisabled ==
+inotify change watcher está deshabilitado
+
+== PendingChangesINotifyEnabledExplanation ==
+Plastic monitoriza el workspace en busca de cambios para acelerar la operación. Esto elimina la necesidad de recorrer la estructura de directorios, aunque la búsqueda de movidos puede consumir tiempo. Plastic aprovecha inotify, pero necesita algunos ajustes para funcionar correctamente. Comprobar: {0}
+
+== PendingChangesINotifyDisabledExplanation ==
+El rendimiento de la vista de cambios pendientes mejora mucho cuando puede aprovechar el sistema de detección basado en inotify. Compruebe las siguientes instrucciones para habilitarlo: {0} y reinicie la GUI
+
+== MergeToMergeNeededExplanation ==
+Durante la operación de merge-to, otro usuario ha creado nuevos changesets en el destino de la operación de merge-to, creando múltiples 'heads'. Considere unificarlas realizando una nueva operación de merge (o merge-to). Ramas afectadas:
+
+== MergeToMergeNeededBranch ==
+{0}@{1}@{2} (xlink '{3}')
+
+== MergeToNeededQuestion ==
+Se han creado nuevos changeset en la rama {0}@{1}@{2} (mount '{3}') durante la operación merge-to. Es necesario realizar un merge de nuevo para completar la operación. ¿Desea hacer merge de nuevo ahora?
+
+== DontShowItAgain ==
+Entendido, no lo muestres de nuevo
+
+== LearnMore ==
+Saber más
+
+== HelpActionNotFound ==
+Lo siento, olvidamos añadir la acción :(
+
+== DaysAgo ==
+hace {0} días
+
+== HoursAgo ==
+hace {0} horas
+
+== MinutesAgo ==
+hace {0} minutos
+
+== SecondsAgo ==
+hace {0} segundos
+
+== JustNow ==
+Ahora mismo
+
+== RemovedLocallyStatus ==
+Borrado localmente
+
+== RemovedStatus ==
+Borrado
+
+== MovedLocallyStatus ==
+Movido localmente
+
+== MovedStatus ==
+Movido
+
+== AddedStatus ==
+Añadido
+
+== IgnoredStatus ==
+Ignorado
+
+== PrivateStatus ==
+Privado
+
+== ReplacedStatus ==
+Reemplazado
+
+== CopiedStatus ==
+Copiado (nuevo)
+
+== CheckedOutStatus ==
+Desprotegido
+
+== ChangedStatus ==
+Cambiado
+
+== HiddenChangedStatus ==
+Cambio oculto
+
+== UnsupportedImageFormat ==
+Formato de imagen no soportado
+
+== ShowPropertiesButton ==
+Ver propiedades
+
+== PreviewConfigAlreadyExist ==
+Ya existe otra configuración con este nombre, por favor, elija otro nombre
+
+== UserDefinedPreview ==
+Herramienta definida por el usuario
+
+== ConfirmDeleteDiffTool ==
+¿Quieres eliminar la configuración de esta herramienta de diferencias?
+
+== ConfirmDeleteMergeTool ==
+¿Quieres eliminar la configuración de esta herramienta de combinación?
+
+== CloudEditionConfigInsertValidEmail ==
+Introduzca su usuario en plasticscm.com
+
+== CloudEditionConfigInsertValidPassword ==
+Introduzca un password
+
+== CloudEditionConfigurationWelcome ==
+Bienvenido a Plastic SCM Cloud Edition!
+
+== CloudEditionConfigurationExplanation ==
+Por favor, introduzca el usuario y password que usa para conectar a Plastic Cloud (el mismo de plasticscm.com). De esta forma no se le pedirán credenciales de nuevo cuando replique a Cloud.
+
+== CloudEditionConfigurationExtraExplanation ==
+Este es el usuario con el que se le identifica cada vez que hace checkin, así que elijalo adecuadamente.
+
+== CloudEditionConfigCheckingCredentials ==
+Comprobando credenciales...
+
+== CloudEditionConfigEmail ==
+Email o nombre de usuario
+
+== CloudEditionConfigPassword ==
+Contraseña
+
+== CloudEditionConfigCheckCredentials ==
+Probar credenciales
+
+== CloudEditionBuyText ==
+Si aún no ha adquirido una cuenta de Cloud Edition pulse aquí para crear una.
+
+== CloudEditionBuyLinkText ==
+Si aún no ha adquirido una cuenta de Cloud Edition pulse [[BUYCLOUD|aquí]] para crear una.
+
+== SelectFieldsMergeDiffOptions ==
+Por favor, seleccione todos los campos en las opciones de Diff/Merge
+
+== SelectFieldsMergeDiffOptionsCaption ==
+Campos no seleccionados
+
+== EOLMethod ==
+Ignorar fines de línea
+
+== WhitespacesMethod == 
+Ignorar espacios y tabuladores
+
+== EOLWhitespacesMethod ==
+Ignorar todo
+
+== NoneMethod ==
+Reconocer todo
+
+== DiffVariables ==
+Las siguientes variables están disponibles para utilizar como parámetros al invocar la herramienta externa de diferencias:
+
+    @sourcefile: ruta en disco del fichero origen
+    @destinationfile: ruta en disco del fichero destino
+
+    @sourcesymbolic: nombre simbólico del fichero origen
+    @destinationsymbolic: nombre simbólico del fichero destino
+
+    @sourcehash: cadena MD5 calculada a partir del fichero origen
+    @destinationhash: cadena MD5 calculada a partir del fichero destino
+
+    @filetype: tipo MIME usado para el realzado de sintaxis
+    @comparationmethod: método de comparación utilizado
+    @fileencoding: codificación de fichero utilizada por defecto si no se detecta la del fichero
+
+Ejemplos:
+
+  Semantic Merge Tool:
+  https://semanticmerge.com/documentation/how-to-configure/semanticmerge-configuration-guide#ConfiguringSemanticMergeastheDiffTool13
+
+    <rauta-a-semanticmerge>\semanticmergetool.exe -s="@sourcefile"
+      -sn="@sourcesymbolic" -d="@destinationfile" -dn="@destinationsymbolic" -i="@comparationmethod"
+      -e="@fileencoding" -edt=default
+
+  Kdiff3
+  http://kdiff3.sourceforge.net/doc/documentation.html
+
+    <ruta-a-kdiff3>\kdiff3.exe" "@sourcefile" "@destinationfile" --L2 "@sourcesymbolic" --L3 "@destinationsymbolic"
+
+  Araxis Merge
+  https://www.araxis.com/merge/documentation-windows/command-line.en
+
+    <ruta-a-araxis>\compare.exe" /title1:"@sourcesymbolic" /title2:"@destinationsymbolic" "@sourcefile" "@destinationfile"
+
+== NoDiffType ==
+Especifique para que tipo de ficheros se abrira esta herramienta de diferencias.
+
+== NoDiffTool ==
+Especifique la línea de comandos de esta herramienta de diferencias.
+
+== DiffToolError ==
+Error en la herramienta de diferencias
+
+== DiffNoExt ==
+No se ha definiedo la extensión para la herramienta de diferencias.
+
+== NoTxtDiff ==
+No se ha definido una herramienta de diferencias para los ficheros de texto.
+
+== NoBinDiff ==
+No se ha definido una herramienta de diferencias para los ficheros binarios.
+
+== NoDiffForExt ==
+No se ha definido una herramienta de diferencias para "{0}".
+
+== DiffToolsError ==
+Error en las herramientas de differencias
+
+== NoDiscoveredServers ==
+No se encontró ningún servidor.
+
+== DownloadPreviewSoftware ==
+Necesita instalar [[{0}|{1}]] para generar vistas previas con esta herramienta
+
+== ExecutableOpenFileDialogFilterWin ==
+Ejecutables (*.exe; *.bat;)|*.exe; *.bat|Todos los archivos (*.*)|*.*
+
+== ExecutableOpenFileDialogFilterNoWin ==
+Todos los archivos (*.*)|*.*
+
+== ValidatePreviewTypeName == 
+Por favor, introduzca un nombre
+
+== ValidatePreviewAddExtension ==
+Por favor, añada al menos una extensión soportada
+
+== NullRefText ==
+Se produjo un error procesando su petición
+
+== PathTooLong ==
+La ruta es demasiado larga
+
+== ServerNullRefText ==
+Se ha producido un error no esperado en el servidor. Para más información consulta el log del servidor.
+
+== MsgInformative ==
+Información
+
+== MsgWarning ==
+Atención
+
+== MsgError ==
+Error
+
+== OptionsGeneral ==
+General
+
+== OptionsDiff ==
+Diff y merge
+
+== OptionsDiffTools ==
+Herramientas de diferencias
+
+== OptionsMergeTools ==
+Herramientas de merge
+
+== OptionsOther ==
+Otras opciones
+
+== OptionsProfiles ==
+Perfiles de conexión
+
+== OptionsExternalPreviewTools ==
+Herramientas de vista previa
+
+== OptionsUserProfile ==
+Perfil del usuario
+
+== MergeVariables ==
+Las siguientes variables están disponibles para utilizar como parámetros al invocar la herramienta externa de merge:
+
+    @sourcefile: ruta en disco del fichero origen
+    @destinationfile: ruta en disco del fichero destino
+    @basefile: ruta en disco del fichero antecesor co mún
+
+    @output: ruta en disco del fichero de resultado del merge
+
+    @sourcesymbolic: nombre simbólico del contribuidor origen
+    @destinationsymbolic: nombre simbólico del contribuidor destino
+    @basesymbolic: nombre simbólico del contribuidor antecesor común
+
+    @sourcehash: cadena MD5 calculada a partir del fichero origen
+    @destinationhash: cadena MD5 calculada a partir del fichero destino
+    @basehash: cadena MD5 calculada a partir del fichero antecesor común
+
+    @filetype: tipo MIME usado para el realzado de sintaxis
+    @comparationmethod: método de comparación utilizado
+    @fileencoding: codificación de fichero utilizada por defecto si no se detecta la del fichero
+    @resultencoding: codificación para el fichero resultado (NONE para que se calcule en funcion de los contribuidores)
+    @mergetype: tipo de merge utilizado
+    @progress: cadena de progreso que indica la operación actual, por ejemplo: Mezclando file 3/10
+    @extrainfofile: ruta a un fichero que contiene información extra acerca del merge actual
+
+Ejemplos:
+
+  Semantic Merge Tool:
+  https://semanticmerge.com/documentation/how-to-configure/semanticmerge-configuration-guide#ConfiguringSemanticMergeastheMergeTool15
+
+    <ruta-a-semanticmerge>\semanticmergetool.exe -b="@basefile" -bn="@basesymbolic" -s="@sourcefile" -sn="@sourcesymbolic"
+      -d="@destinationfile"  -dn="@destinationsymbolic" -r="@output" -i="@comparationmethod"
+      -e="@fileencoding" -emt=default -edt=default
+
+  Kdiff3:
+  http://kdiff3.sourceforge.net/doc/documentation.html
+
+    <ruta-a-kdiff3>\kdiff3.exe" "@basefile" "@sourcefile" "@destinationfile"
+      -o @output --L1 "@basesymbolic"  --L2 "@sourcesymbolic" --L3 "@destinationsymbolic"
+
+  Araxis Merge:
+  https://www.araxis.com/merge/documentation-windows/command-line.en
+
+    <ruta-a-araxis>\compare.exe" /wait /a1 /3 /title1:"@basesymbolic" 
+      /title2:"@sourcesymbolic" /title3:"@destinationsymbolic" "@basefile" "@sourcefile"
+      "@destinationfile" "@output"
+
+== NoMergeType ==
+Especifique para que tipo de ficheros se abrira esta herramienta de merge.
+
+== NoMergeTool ==
+Especifique la línea de comandos de esta herramienta de merge.
+
+== MergeToolError ==
+Error en la herramienta de merge
+
+== MergeNoExt ==
+No se ha definiedo la extensión para la herramienta de merge.
+
+== NoTxtMerge ==
+No se ha definido una herramienta de merge para los ficheros de texto.
+
+== NoBinMerge ==
+No se ha definido una herramienta de merge para los ficheros binarios.
+
+== NoMergeForExt ==
+No se ha definido una herramienta de merge para "{0}".
+
+== MergeToolsError ==
+Error en las herramientas de merge
+
+== ConfirmDeletePreviewProvider ==
+¿Desea borrar la herramienta de vista previa seleccionada?
+
+== CreateNewProfileTitle ==
+Añadir un nuevo perfil de conexión a un servidor
+
+== EditProfileTitle ==
+Editar un perfil existente de conexión a servidor
+
+== ProfileNameInputLabel ==
+Dé un nombre al perfil
+
+== ProfileConnectionTypeLabel ==
+Seleccione el tipo de conexión
+
+== ProfileConnOnDemand ==
+Bajo demanda
+
+== ProfileConnOnDemandTooltip ==
+El perfil sólo se utilizará al establecer una conexión con el servidor almacenado en él.
+
+== ProfileConnAuto ==
+Automática
+
+== ProfileConnAutoTooltip ==
+El servidor almacenado se mostrará en la lista de la vista de repositorios. Utilice esta opción para servidores permanentemente accesibles.
+
+== ProfileDialogExplanation ==
+Un perfil de conexión le permite almacenar parámetros de autenticación en servidores remotos.
+
+== ProfileNameEmpty ==
+El nombre del perfil no puede estar vacío.
+
+== ProfileNameAlreadyExists ==
+El nombre del perfil ya existe
+
+== DeleteProfileConfirmation ==
+Vas a borrar el perfil seleccionado. ¿Está seguro?
+
+== DeleteProfileCaption ==
+Borrar perfil
+
+== NotValidProxyServer ==
+El servidor especificado {0} no es un servidor Proxy válido.
+
+== ConnectedOk ==
+Conexión OK
+
+== ConfigurationUserNameInfo ==
+Se utilizará el siguiente nombre de usuario:
+
+== ConfigurationCredentialsInfo ==
+Configure sus credenciales
+
+== PlasticConfiguration ==
+Configuración de Plastic SCM
+
+== ConfigurationServerInfo ==
+Introduzca el nombre (o la dirección IP) y el puerto de su servidor Plastic SCM. Puede utilizar "escanear red" para encontrar servidores Plastic SCM en su red
+
+== ConfigureProxy ==
+Usar un servidor Proxy
+
+== Preferences ==
+Preferencias
+== SwitchModeConfirmationDialogTitle ==
+Confirmación de cambio de modo
+
+== SwitchModeConfirmationDialogExplanation ==
+Estás en el modo {0}. ¿Estás seguro que quieres cambiar al modo {1}?
+
+Encuentra más información acerca de Gluon aqui: {2}
+
+== DeveloperMode ==
+Desarrollador
+
+== GluonMode ==
+Gluon
+
+== ReloadButton ==
+Recargar
+
+== OpenGUIButton ==
+Abrir GUI
+
+== AllCheckButton ==
+Todo
+
+== SearchTooltip ==
+Buscar
+
+== CannotLaunchInProgressMergeFromNotRootMountPoint ==
+No se puede continuar este merge. El merge en progreso pertenece a un repositorio dentro de un xlink. Esta opción sólo está soportada cuando el merge en progreso pertenece al repositorio raíz en el workspace. Puede lanzar el merge de forma manual para continuar.
+
+== OneVersionBehind ==
+1 versión por detrás
+
+== TwoOrMoreVersionsBehind ==
+{0} versiones por detrás
+
+== GitSyncAllRefsRejected ==
+Todas las referencias(ramas o etiquetas) fueron rechazadas por el servidor, así que posiblemente en el repositorio central no hay nada nuevo. Comprueba la configuración del proveedor del hosting de Git . Errores durante el push:{0}
+
+== LoggingIn ==
+Iniciando sesión como '{0}'...
+
+== SigningUp ==
+Creando cuenta '{0}'...
+
+== GettingDatacenters ==
+Obteniendo los datacenters ...
+
+== EnterOrganizationName ==
+Por favor introduzca el nombre de la organización
+
+== NoDatacenterSelected ==
+Por favor seleccione un datacenter
+
+== CreatingOrganization ==
+Creando organización '{0}'...
+
+== OrganizationNameTooShort ==
+El nombre de la organización debe tener al menos tres caracteres
+
+== Login ==
+Iniciar sesión
+
+== LoginTitle ==
+Use su cuenta de plasticscm.com para iniciar sesión
+
+== LoginButton ==
+Iniciar sesión
+
+== SignUp ==
+Crear cuenta
+
+== SignUpTitle ==
+Cree una cuenta en plasticscm.com
+
+== SignUpNeeded ==
+No se ha podido encontrar la cuenta {0}, por favor cree una cuenta en plasticscm.com
+
+== SignUpButton ==
+Crear cuenta
+
+== SignInButton ==
+Inicia sesión
+
+== SignInToPlasticSCM ==
+Inicia sesión en Plastic SCM
+
+== SignInWithGoogle ==
+Inicia sesión con Google
+
+== SignInWithUnityID ==
+Inicia sesión con Unity ID
+
+== SignInWithEmail ==
+Inicia sesión con Email
+
+== SignInWithOkta ==
+Inicia sesión con Okta
+
+== SignInWithSSO ==
+Inicia sesión con SSO
+
+== ConfirmPassword ==
+Confirma password:
+
+== SignedUpTitle ==
+¡Creada cuenta en plasticscm.com!
+
+== LoggedInTitle ==
+¡Iniciada sesión en plasticscm.com!
+
+== CreateFirstOrganizationLabel ==
+Ahora es el momento de crear su organización en la nube.
+
+== CreateOtherOrganizationLabel ==
+O quizás prefieres crear la tuya propia
+
+== YouBelongToOrganization ==
+Perteneces a la organización:
+{0}
+
+== YouBelongToSeveralOrganizations ==
+Perteneces a varias organizaciones:
+
+== JoinButton ==
+Unirse
+
+== CreateOrganizationTitle ==
+Crea tu organización en la nube
+
+== OrganizationName ==
+Nombre de la organización:
+
+== Datacenter ==
+Datacenter:
+
+== DatacenterExplanation ==
+El más cercano está ya seleccionado :)
+
+== EncryptionCheckButton ==
+Encriptar todos los datos enviados a Plastic Cloud
+
+== EncryptionCheckButtonExplanation ==
+Puedes forzar que todos los datos enviados a Plastic Cloud estén encriptados antes de abandonar tu ordenador. De esta manera te aseguras que tus datos no puedan ser comprometidos. Si selecciona esta opción, todos los miembros de la organización tendrán que compartir la misma clave secreta para cifrar / descifrar datos.
+{0}
+
+== CreatedOrganizationTitle ==
+Organización creada correctamente
+
+== CreatedOrganizationExplanation ==
+La organización {0} fue creada correctamente
+
+== ContinueButton ==
+Continuar
+
+== RetryButton ==
+Reintentar
+
+== CloudEditionOrganization ==
+Eres parte de la organización {0}
+
+== SignUpAgreeTo ==
+Al hacer clic a continuación en 'Crear cuenta', aceptas nuestro {0} y {1}. Ocasionalmente le enviaremos correos electrónicos relacionados con su cuenta.
+
+== SignUpAgreeToShort ==
+Al hacer clic 'Crear cuenta', aceptas nuestro {0} y {1}
+
+== SignInAgreeToShort ==
+Al hacer clic 'Iniciar sesión', aceptas nuestro {0} y {1}
+
+== TermsOfService ==
+Términos de servicio
+
+== PrivacyPolicy ==
+Política de privacidad
+
+== Email ==
+Email:
+
+== BackButton ==
+< Atrás
+
+== LastThingTitle ==
+Una última cosa
+
+== LastThingExplanation ==
+Hay dos versiones de Plastic.
+Puedes usar ambos, en cualquier momento.
+
+== PlasticForDevelopersTitle ==
+Plastic para desarrolladores
+
+== PlasticForDevelopersExplanation ==
+La versión clásica, una buena opción para trabajar con ramas, merges y replica
+
+== PlasticForArtistsTitle ==
+Gluon - Plastic para artistas
+
+== PlasticForArtistsExplanation ==
+La versión simplificada para artistas que desarrollan videojuegos, o para cualquiera que prefiera hacer cambios y olvidarse
+
+== LaunchButton ==
+Lanzar
+
+== LaunchGluonButton ==
+Lanzar Gluon
+
+== ReplyButton ==
+Responder
+
+== CommentButton ==
+Comentar
+
+== DiscardUnsavedChangesTitle ==
+Descartar cambios
+
+== DiscardUnsavedChangesQuestion ==
+¿Estás seguro que quieres descartar los cambios no guardados?
+
+== DiscardButton ==
+Descartar
+
+== DeleteCommentQuestion ==
+¿Estás seguro que quieres eliminar esto?
+
+== CheckingLockRulesProgress ==
+Comprobando si el fichero puede bloquearse...
+
+== ConfigLocksNoPermissions ==
+No tiene el permiso 'configlocks'. Contacte con su administrador para que le conceda el permiso 'configlocks' en el repositorio '{0}', o para que configure una regla de bloqueo para este fichero.
+
+== ConfigLocksItemNoExtensionMessage ==
+El fichero {0} no tiene extensión. Actualmente esta opción no permite configurar reglas de bloqueo para ficheros sin extensión.
+
+== AddLockRuleAndCheckoutTitle ==
+Añadir regla de bloqueo y desproteger para editar
+
+== AddLockRuleAndCheckoutMessage ==
+Para bloquear un fichero, primero debe configurar una regla de bloqueo.{0{0}Elija una de las opciones siguientes para configurar qué ficheros se bloquean automáticamente al desproteger para editar.
+
+== AddLockRuleRadioGroup ==
+Escoge una regla de bloqueo o cree la suya
+
+== AddLockRuleExtensionOption ==
+Bloquear ficheros que concuerden con {0}
+
+== AddLockRuleNameOption ==
+Bloquear ficheros con nombre '{0}'
+
+== AddLockRuleDirectoryOption ==
+Bloquear todos los ficheros en el directorio{0}{1}
+
+== AddLockRuleFullPathOption ==
+Bloquear únicamente{0}{1}
+
+== AddLockRuleEditOption ==
+Quiero editar la regla de bloqueo
+
+== AddLockRuleLearnMore ==
+Pulse aquí para saber más sobre cómo configurar reglas de bloqueo
+
+== AddLockRuleLearnMoreUrl ==
+https://www.plasticscm.com/download/help/locking
+
+== AddLockRuleEmptyRuleMessage ==
+La regla no puede estar vacía.
+
+== UnsupportedServerOperation ==
+El servidor no soporta esta operación. Actualice el servidor a la versión {0} o superior.
+
+== KnownServersListRetrievingCloudOrgsProgress ==
+Obteniendo organizaciones Cloud...
+
+== EditCommentButton ==
+Editar comentario
+
+== DiffChangedWithCommentDirty ==
+Ha editado el comentario, ¿desea guardar los cambios?
+
+== ReviewOfChangesetTitle ==
+Revisión del changeset {0}
+
+== ReviewOfBranchTitle ==
+Revisión de la rama {0}
+
+== Title ==
+Título
+
+== ReviewStatus ==
+Estado
+
+== Reworkrequired ==
+Requiere cambios
+
+== UnderReview ==
+En revisión
+
+== Reviewed ==
+Revisado
+
+== Reviewer ==
+Revisor
+
+== ChangeButton ==
+Cambiar
+
+== ReviewCommentsLabel ==
+Comentarios para la línea {0}
+
+== NoReviewCommentsToShow ==
+Haga clic en un icono a la derecha del diff para ver el comentario de revisión para una línea dada
+
+== NoReviewCommentsForSelectedFile ==
+No hay comentarios de revisión para el fichero seleccionado
+
+== NoReviewComments ==
+Haga clic en el signo '+' a la derecha del diff para crear un nuevo comentario para una línea dada
+
+== NoReviewCommentsSupportedXlinkedRepo ==
+Los Xlink todavía no soportan comentarios de revisión
+
+== NoReviewCommentsSupportedDifferentRepos ==
+Los ficheros dentro de Xlinks todavía no soportan comentarios de revisión
+
+== NoReviewCommentsSupportedUnsupportedFileType ==
+Éste tipo de fichero todavía no soporta comentarios de revisión
+
+== DirtyCodeReviewTitleTitle ==
+Guardar el título
+
+== DirtyCodeReviewTitleQuestion ==
+Ha editado el título de la revisión de código, ¿desea guardar los cambios?
+
+== DirtyReviewCommentTitle ==
+Guardar comentario de revisión
+
+== DirtyReviewCommentQuestion ==
+Ha editado el comentario de revisión, ¿desea guardar los cambios?
+
+== DirtyCommentQuestion ==
+Ha editado el comentario, ¿desea guardar los cambios?
+
+== NullRepSpec ==
+Falta la información del repositorio para calcular las diferencias.
+Por favor reporte este caso a soporte para arreglarlo.
+
+== CommentsLabelSingular ==
+Comentario de revisión
+
+== CommentsLabelPlural ==
+Comentarios de revisión
+
+== ChangesLabelSingular ==
+Cambio
+
+== ChangesLabelPlural ==
+Cambios
+
+== ChangeColumn ==
+Cambio solicitado
+
+== RevisionWithComments ==
+Revisión comentada
+
+== LastInBranch ==
+Última de la rama
+
+== DiffWithHead ==
+Diff con head
+
+== ThisFileHasNewChangesInTheBranch ==
+Este fichero tiene cambios nuevos en la rama
+
+== ThisFileHasNewChangesInTheBranchExplanation ==
+Esta es la revisión en la que se añadieron los comentarios. Puede hacer diff de la revisión original, la más nueva en la rama o ver los cambios entre las dos.
+
+== AskQuestionButton ==
+Hacer pregunta
+
+== AskQuestionButtonToolTip ==
+Cuando necesites una respuesta antes de aprobarlo
+
+== RequestChangeButton ==
+Solicitar cambio
+
+== RequestChangeButtonToolTip ==
+Cuando necesites que el autor cambie algo antes de aprobarlo
+
+== CopyCommentId ==
+Copiar comentario ID al portapapeles
+
+== ChangeStatusDone ==
+Hecho
+
+== ChangeStatusPending ==
+Pendiente
+
+== ChangeStatusDiscarded ==
+Descartado
+
+== QuestionsLabelSingular ==
+Pregunta
+
+== QuestionsLabelPlural ==
+Preguntas
+
+== QuestionColumn ==
+Pregunta
+
+== AnswerColumn ==
+Respuesta
+
+== ExploreChangesetsPanelWaitingAnimation ==
+Cargando changesets...
+
+== ChangesetReview ==
+Revisar changeset
+
+== ReviewEntireBranch ==
+Revisar rama completa
+
+== ReviewChangesetByChangeset ==
+Revisar changeset a changeset
+
+== UpdateStatusTitle ==
+Confirmar actualización de estado
+
+== UpdateStatusPendingChangesSingular ==
+Hay 1 cambio sin aplicar.
+
+== UpdateStatusPendingChangesPlural ==
+Hay {0} cambios sin aplicar.
+
+== UpdateStatusPendingQuestionsSingular ==
+Hay 1 pregunta sin contestar.
+
+== UpdateStatusPendingQuestionsPlural ==
+Hay {0} preguntas sin contestar.
+
+== UpdateStatusPendingChangeAndQuestion ==
+Hay 1 cambio sin aplicar y 1 pregunta sin contestar.
+
+== UpdateStatusPendingChangesAndQuestion ==
+Hay {0} cambios sin aplicar y 1 pregunta sin contestar.
+
+== UpdateStatusPendingChangeAndQuestions ==
+Hay 1 cambio sin aplicar y {0} preguntas sin contestar.
+
+== UpdateStatusPendingChangesAndQuestions ==
+Hay {0} cambios sin aplicar y {1} preguntas sin contestar.
+
+== UpdateStatusQuestion ==
+No deberías marcar como revisada una revisión de código con comentarios pendientes. ¿Quieres continuar?
+
+== SinceOneWeekAgo ==
+1 semana atrás
+
+== SinceFifteenDaysAgo ==
+15 días atrás
+
+== SinceOneMonthAgo ==
+1 mes atrás
+
+== SinceThreeMonthsAgo ==
+3 meses atrás
+
+== SinceAGivenDate ==
+Una fecha concreta
+
+== CloseChangeRequestedInReview ==
+Cerrar cambio pedido en revisión
+
+== CollapseReviewCommentsTooltip ==
+Colapsar comentarios de revisión
+
+== ExpandReviewCommentsTooltip ==
+Expandir comentarios de revisión
+
+== CollapseCommentsSummaryTooltip ==
+Colapsar resumen de comentarios
+
+== ExpandCommentsSummaryTooltip ==
+Expandir resumen de comentarios
+
+== ReviewCommentsSummaryTitle ==
+Resumen de comentarios de revisión
+
+== EmptyChangeList ==
+La lista de cambios solicitados esta vacia
+
+== EmptyQuestionList ==
+La lista de preguntas esta vacía
+
+== MergeFileChangesInConflictSingular ==
+Conflictos de fichero, que podrían requerir intervención manual (1 item)
+
+== MergeFileChangesInConflictPlural ==
+Conflictos de fichero, que podrían requerir intervención manual ({0} items)
+
+== FileConflictsExplanation ==
+Conflictos de fichero, que podrían requerir intervención manual.
+
+== FileConflictsExplanationForIncomingView ==
+Ficheros a descargar que están en conflicto con sus cambios.
+
+== ChangesWithDirectoryConflictsSingular ==
+Cambios con conflictos en la estructura de directorios (1 item)
+
+== ChangesWithDirectoryConflictsPlural ==
+Cambios con conflictos en la estructura de directorios ({0} items)
+
+== MergeFileChangesInConflictForIncomingViewSingular ==
+Ficheros a descargar que están en conflicto con sus cambios (1 item)
+
+== MergeFileChangesInConflictForIncomingViewPlural ==
+Ficheros a descargar que están en conflicto con sus cambios ({0} items)
+
+== MergeFileChangesInConflictForGluonSingular ==
+Ficheros a descargar que están en conflicto con sus cambios ({0} de 1 item)
+
+== MergeFileChangesInConflictForGluonPlural ==
+Ficheros a descargar que están en conflicto con sus cambios ({0} de {1} items)
+
+== MergeFileChangesInConflictRemark ==
+Cambiado en origen y destino
+
+== MergeFileChangesInConflictRemarkForIncomingView ==
+Requiere merge
+
+== MergeChangesMadeInSourceOfMergeSingular ==
+Cambios en el origen del merge. No hay conflictos. (1 item)
+
+== MergeChangesMadeInSourceOfMergePlural ==
+Cambios en el origen del merge. No hay conflictos. ({0} items)
+
+== MergeChangesMadeInSourceOfMergeForIncomingViewSingular ==
+Ficheros que solo necesitan actualización (1 item)
+
+== MergeChangesMadeInSourceOfMergeForIncomingViewPlural ==
+Ficheros que solo necesitan actualización ({0} items)
+
+== MergeChangesMadeInSourceOfMergeForGluonSingular ==
+Ficheros que solo necesitan actualización ({0} de 1 item)
+
+== MergeChangesMadeInSourceOfMergeForGluonPlural ==
+Ficheros que solo necesitan actualización ({0} de {1} items)
+
+== MergeMovesToApplySingular ==
+Movidos a aplicar (1 item)
+
+== MergeMovesToApplyPlural ==
+Movidos a aplicar ({0} items)
+
+== MergeMovesToApplyForGluonSingular ==
+Movidos a aplicar ({0} de 1 item)
+
+== MergeMovesToApplyForGluonPlural ==
+Movidos a aplicar ({0} de {1} items)
+
+== MergeMovesToApplyRemark ==
+Movido en origen a {0}
+
+== MergeMovesToApplyRemarkForIncomingView ==
+Aplicará el movido a tu espacio de trabajo
+
+== MergeDeletesToApplySingular ==
+Borrados a aplicar (1 item)
+
+== MergeDeletesToApplyPlural ==
+Borrados a aplicar ({0} items)
+
+== MergeDeletesToApplyForGluonSingular ==
+Borrados a aplicar ({0} de 1 item)
+
+== MergeDeletesToApplyForGluonPlural ==
+Borrados a aplicar ({0} de {1} items)
+
+== MergeDeletesToApplyRemark ==
+Borrado en origen
+
+== MergeDeletesToApplyRemarkForIncomingView ==
+Aplicará el borrado a tu espacio de trabajo
+
+== MergeNewItemsToDownloadSingular ==
+Items nuevos a descargar (1 item)
+
+== MergeNewItemsToDownloadPlural ==
+Items nuevos a descargar ({0} items)
+
+== MergeNewItemsToDownloadForGluonSingular ==
+Items nuevos a descargar ({0} de 1 item)
+
+== MergeNewItemsToDownloadForGluonPlural ==
+Items nuevos a descargar ({0} de {1} items)
+
+== MergeNewItemsToDownloadRemark ==
+Añadido en origen
+
+== MergeNewItemsToDownloadRemarkForIncomingView ==
+Aplicará el añadido a tu espacio de trabajo
+
+== MergeFileSystemPermissionsChangesToApplySingular ==
+Cambios de permisos a aplicar (1 item)
+
+== MergeFileSystemPermissionsChangesToApplyPlural ==
+Cambios de permisos a aplicar ({0} items)
+
+== MergeFileSystemPermissionsChangesToApplyRemark ==
+Cambios en los permisos del fichero
+
+== MergeFileSystemPermissionsChangesToApplyRemarkForIncomingView ==
+Aplicará los cambios de permisos del fichero en tu espacio de trabajo
+
+== MergeFilesToDownloadCaptionSingular ==
+1 fichero a descargar ({0})
+
+== MergeFilesToDownloadCaptionPlural ==
+{0} ficheros a descargar ({1})
+
+== MergeFilesToDeleteCaptionSingular ==
+1 fichero a borrar ({0})
+
+== MergeFilesToDeleteCaptionPlural ==
+{0} ficheros a borrar ({1})
+
+== MergeToEnterCheckinComment ==
+Introduce comentario de checkin
+
+== MergeToEnterCheckinCommentExplanation ==
+Introduce un comentario de checkin para el changeset creado por el merge-to.
+
+== IncomingChangesTitle ==
+Cambios entrantes de la rama {0}
+
+== IncomingChangesCannotBeApplied ==
+Cambios entrantes que no pueden ser aplicados
+
+== ConfirmRecalculateMergeSingular ==
+Hay 1 conflicto de directorio resuelto. ¿Quiere recalcular el merge?
+
+== ConfirmRecalculateMergePlural ==
+Hay {0} conflictos de directorio resueltos. ¿Quiere recalcular el merge?
+
+== ConfirmRecalculateMergeMessage ==
+Si continúa, se perderán las resoluciones de conflictos elegidas. Puede elegirlas de nuevo.
+
+== RecalculateButton ==
+Recalcular
+
+== MergeProgressStatus ==
+Actualizados {0} de {1} ({2} de {3} ficheros a descargar / {4} de {5} operaciones a aplicar)
+
+== MergeProgressDownloadingFile ==
+Descargando fichero {0} ({1})
+
+== MergeProgressDownloadingBlock ==
+Descargando bloque de {0} ficheros ({1})
+
+== IncomingChangesAvailableSingular ==
+1 nuevo changeset disponible
+
+== IncomingChangesAvailablePlural ==
+{0} nuevos changesets disponibles
+
+== IncomingChangesConflictsSingular ==
+1 nuevo changeset - conflictos
+
+== IncomingChangesConflictsPlural ==
+{0} nuevos changesets - conflictos
+
+== IncomingChangesAvailableForGluon ==
+nuevos cambios disponibles
+
+== IncomingChangesConflictsForGluon ==
+nuevos cambios en conflicto
+
+== UpdateButton ==
+Actualizar
+
+== ViewButton ==
+Ver
+
+== DeleteRepositoryTitle ==
+Confirma la eliminación de repositorio
+
+== UndeleteRepositoryTitle ==
+Confirma la recuperación del repositorio
+
+== DeleteRepositoryWarningText ==
+Estás a punto de eliminar el repositorio '{0}'.
+
+== DeleteRepositoriesWarningText ==
+Estás a punto de eliminar los siguientes repositorios:
+
+== DeleteMultipleRepositoriesWarningText ==
+Estás a punto de eliminar varios repositorios
+
+== DeleteRepositoryConfirmText ==
+Para confirmar, escribe el nombre del repositorio
+
+== DeleteRepositoriesConfirmText ==
+Para confirmar la eliminación, escribe '{0}'
+
+== DeleteRepositoryCannotUndo ==
+Esta acción no se puede deshacer.
+
+== DeleteRepositoryConfirmEntry ==
+borrar
+
+== UndeleteRepositoryConfirmText ==
+Estás a punto de recuperar los siguientes repositorios: {0}. ¿Deseas continuar?
+
+== IncomingChangesMenuItemMergeKeepingSourceChanges ==
+Merge manteniendo los cambios entrantes (head/origen)
+
+== IncomingChangesMenuItemMergeKeepingWorkspaceChanges ==
+Merge manteniendo los cambios del espacio de trabajo (tuyos/destino)
+
+== IncomingChangesMenuItemDiffIncomingChanges ==
+Diferencias del cambio entrante (head/origen)
+
+== IncomingChangesMenuItemDiffYoursWithIncoming ==
+Diferencias del cambio local con el entrante (head/origen)
+
+== IncomingSymbolicName ==
+Cambios Entrantes
+
+== ParentRevisionSymbolicName ==
+Revisión padre
+
+== WorkingChangesetMissing ==
+Changeset de trabajo borrado
+
+== WorkingChangesetDeletedTitle ==
+El changeset de trabajo fue borrado
+
+== WorkingChangesetDeletedMessage ==
+El changeset en el que estabas trabajando ha sido borrado.
+
+Tus checkouts y cambios locales ya no son válidos.
+
+¿Desea ir a la Pending Changes para deshacer todos sus cambios y volver a una configuración válida?
+
+== UndoAllWorkingChangesetDeletedMessage ==
+Deshacer los cambios requiere actualizar el workspace porque el changeset en el que estabas trabajando ha sido borrado.
+
+¿Quieres continuar?
+
+== IncomingChangesUpdateTooltip ==
+Hay nuevos cambios en la rama que puedes previsualizar y descargar
+
+== IncomingChangesResolveTooltip ==
+Hay ficheros que están en conflicto con sus cambios actuales
+
+== IncomingChangesWorkingChangesetMissingTooltip ==
+Se eliminó el changeset en el que estabas trabajando. Haga clic en el botón "Actualizar" para volver a una configuración válida
+
+== PartialUndoWorkingChangesetDeletedMessage ==
+Es necesario que deshagas todos tus cambios porque el changeset en el que estabas trabajando ha sido borrado.
+
+¿Quieres deshacer todos tus cambios y actualizar tu workspace a una configuración válida?
+
+== OutOfDateIncomingChangesView ==
+Esta vista ya no es válida porque el changeset en el que estabas trabajando ha sido borrado.
+
+Es necesario actualizar el workspace.
+
+== Warning ==
+Aviso
+
+== IncomingChangesViewTitle ==
+Incoming changes
+
+== Reason ==
+Razón
+
+== LoadingCodeReviews ==
+Cargando revisiones de código...
+
+== ReviewTitleColumn ==
+Título
+
+== ReviewStatusColumn ==
+Estado
+
+== ReviewReviewerColumn ==
+Revisor
+
+== MergingFile ==
+Mezclando fichero {0} de {1}: {2}
+
+== CodeReviewMenuItemOpen ==
+Abrir
+
+== CodeReviewMenuItemDelete ==
+Eliminar
+
+== DeletingCodeReview ==
+Eliminando revisión de código con título {0}...
+
+== BranchMenuCreateANewCodeReview ==
+Crear nueva revisón de código para esta rama...
+
+== ChangesetMenuCreateANewCodeReview ==
+Crear nueva revisón de código para este changeset...
+
+== CreatingCodeReview ==
+Creando nueva revisión de código con título {0}...
+
+== ObtainingCodeReviewInfo ==
+Cargando revisón de código con título {0}...
+
+== UpgradeServerForNewCodeReviewError ==
+¡Necesitas actualizar el servidor a la versión 8.0.16.3691 o superior para poder utilizar el nuevo sistema de code review!
+
+== LoadingMembers ==
+Cargando miembros...
+
+== UserChooserDialogTitle ==
+Seleccione un usuario o grupo de la lista:
+
+== NoUserSelectedErrorMessage ==
+Seleccione un usuario de la lista
+
+== UserNotFoundErrorMessage ==
+No se encontró ningún usuario o grupo con nombre '{0}'
+
+== UserSizeLimitExceededErrorMessage ==
+Se ha excedido el número máximo de resultados para una única consulta contra el servidor de autenticación. Use el filtro de búsqueda para recuperar menos resultados (pulsa el botón de refresco para forzar la consulta).
+
+== CodeReviewOlderRevisionsNotSupported ==
+El comentario de code review que se selección se creó en una revisión anterior. Esto significa que alguien cambió el item comentado después de haber introducido el comentario. El nuevo sistema de Code Review está todavía en fase beta, por lo que desgraciadamente no podemos mostrar el comentario en su contexto original.
+
+== CodeReviewInBetaWarningText ==
+Las revisiones de código están todavía en beta - lea las restricciones aquí.
+
+== CodeReviewInBetaWarningLink ==
+https://plasticscm.com/download/help/code-review-restrictions
+
+== CodeReviewInBetaWarningLinkedText ==
+aquí
+
+== CreateRepositoryDialogDetailedExplanation ==
+Los repositorios almacenan todos los objetos versionados de tu desarrollo, incluyendo revisiones de ficheros y directorios, las etiquetas en las revisiones de esos ítems.
+
+== CheckClearAll ==
+Marcar/desmarcar todos
+
+== MergeToMenuItemMergeKeepingDestinationChanges ==
+Merge manteniendo los cambios del destino
+
+== MergeToMenuItemPreserveDestinationChanges ==
+Mantener los cambios del destino
+
+== MergeToMenuItemMergeKeepingSourceChanges ==
+Merge manteniendo los cambios del origen
+
+== MergeToMenuItemPreserveSourceChanges ==
+Mantener los cambios del origen
+
+== DetailsColumn ==
+Detalles
+
+== AuthorColumn ==
+Autor
+
+== PrivacyStatementText ==
+Controladora: Codice Software, S.L. Propósito: Crear su cuenta y proporcionar los servicios necesarios. Puede ejercer sus derechos de acceso, rectificación, borrado y otro derechos de protección de datos como se describe en nuestra Declaración de Privacidad. Para más información ver {0}
+
+== PrivacyStatement ==
+Declaración de Privacidad
+
+== SignUpWithUnity ==
+Regístrate con Unity. Usa tu ID y contraseña de Unity.
+
+== GitSyncDialogTitle ==
+Sincronización de Plastic SCM con Git
+
+== GitSyncDialogExplanation ==
+Sincronizar repositorio '{0}'
+
+== GitSyncDialogDetailedExplanation ==
+Sincronizará los commits y changesets necesarios entre los repositorios de Git y Plastic SCM
+
+== SyncButton ==
+Sincronizar
+
+== PlasticRepository ==
+Repositorio Plastic SCM:
+
+== GitRepositoryUrl ==
+URL del repositorio Git:
+
+== GitRepositoryCannotBeEmpty ==
+El campo URL del repositorio no puede estar vacío.
+
+== LoadingStoredGitUrls ==
+Cargando URLs de Git almacenadas para el repositorio '{0}'
+
+== SyncStatusPullRepository ==
+Importando "{0}" desde {1}
+
+== SyncStatusPushRepository ==
+Exportando "{0}" hacia {1}
+
+== SyncStatusSyncRepository ==
+Sincronizando "{0}" con {1}
+
+== SyncStatusConflict ==
+Precaución: existen ramas que se han modificado de manera concurrente en Git y Plastic SCM.
+Estos conflictos se gestionan como una "sub-rama" en Plastic SCM, y necesitan una operación de merge.
+Para poder sincronizar nuevamente, deberá resolver los conflictos en estas ramas en primer lugar.
+
+== SyncPhaseUpgradingMappings ==
+Descargando mappings
+
+== SyncPhaseReceivingReferences ==
+Obteniendo referencias
+
+== SyncPhaseSyncType ==
+Comprimiendo objetos
+
+== SyncPhaseCompressing ==
+Comprimiendo
+
+== SyncPhaseDownloading ==
+Descargando
+
+== SyncPhaseProcessing ==
+Procesando
+
+== SyncPhaseImporting ==
+Importando
+
+== SyncPhaseExporting ==
+Exportando
+
+== SyncPhasePackaging ==
+Empaquetando
+
+== SyncPhaseUploading ==
+Enviando
+
+== SyncPhaseCompleted ==
+Completado
+
+== Users ==
+Usuarios
+
+== Groups ==
+Grupos
+
+== Both ==
+Ambos
+
+== SelectedUserOrGroup ==
+Usuario o grupo seleccionado:
+
+== User ==
+Usuario
+
+== Group ==
+Grupo
+
+== SpecialUser ==
+Usuario especial
+
+== SpecialGroup ==
+Grupo especial
+
+== AddButton ==
+Añadir...
+
+== RemoveButton ==
+Eliminar
+
+== AllowAll ==
+Permitir todo
+
+== Deny All ==
+Denegar todo
+
+== RepositoryServerPermissions ==
+Permisos del Servidor de Repositorios
+
+== PermissionsFor ==
+Permisos para {0}
+
+== ConfigureObjectPermissions ==
+Configure los permisos asociados al objeto seleccionado
+
+== PermissionsColumn ==
+Permisos
+
+== AllowedColumn ==
+Permit.
+
+== DeniedColumn ==
+Deneg.
+
+== SecurityRepserverEntriesCannotBeEmpty ==
+El servidor de repositorios tiene que tener definidos permisos para, al menos, un usuario o grupo válido.
+Por favor, defina permisos para uno de ellos e inténtelo de nuevo
+
+== PermissionsCantRemoveInheritedSeid ==
+No se puede eliminar una entrada heredada
+
+== MsgAllowDeny ==
+Los permisos denegados sobrescribirán los permitidos
+
+== ChangeOwner ==
+Cambiar...
+
+== UsersAndGroups ==
+Usuarios y grupos
+
+== PermissionsMenuItem ==
+Permisos
+
+== Override ==
+sobrescribir
+
+== OverrideHelp ==
+Los permisos se pueden sobrescribir para anular la herencia. Marque como sobreescrito, a continuación, establezca el nuevo valor.
+
+== DeleteBranchGroup ==
+Borrar grupo de ramas
+
+== DeleteSelectedBranchGroup ==
+El grupo de ramas seleccionado va a ser borrado.
+
+== ContinueQuestion ==
+¿Desea continuar?
+
+== PathPermissions ==
+Permisos de rutas
+
+== DeleteSecuredPath ==
+Borrar ruta
+
+== DeleteSelectedSecuredPath ==
+La ruta seleccionada va a ser borrada.
+
+== AllBranches ==
+Todas las ramas
+
+== NewBranchGroupTitle ==
+Selecciona ramas
+
+== NewBranchGroupExplanation ==
+Selecciona las ramas donde los permisos de la ruta serán aplicados
+
+== NewBranchGroupLabel ==
+Introduzca las ramas
+
+== AllBranchesRadioButton ==
+Todas las ramas
+
+== BranchesRadioButton ==
+Ramas:
+
+== NewBranchGroupIdentificationTag ==
+Introduzca una etiqueta identificativa para el grupo de ramas:
+
+== NoBranchSelected ==
+No hay rama seleccionada
+
+== EditBranchGroupLabel ==
+Editar grupo de ramas
+
+== EditBranchGroupExplanation ==
+Añadir o eliminar ramas del grupo de ramas
+
+== PathPermissionFormExplanation ==
+Configurar permisos para una ruta. Los permisos de la ruta especificada serán mezclados con la rama correspondiente y las rutas padre.
+
+== RetrievingRepositoryInfoProgress ==
+
+== RetrievingRepositoryServerInfoProgress ==
+Obteniendo detalles del servidor de repositorios...
+
+== CalculatingPermissionsInfo == 
+Obteniendo información de permisos...
+
+== RetrievingSecuredPathsProgress ==
+Obteniendo información de rutas...
+
+== RetrievingAllSecuredPathsProgress ==
+Retrieving información de todas las rutas...
+
+== NewSecuredPathTitle ==
+Crear nueva ruta segura
+
+== NewSecuredPathExplanation ==
+Crear nueva ruta donde puedes definir permisos
+
+== NewSecuredPathLabel ==
+Por favor, introduzca una ruta
+
+== DefineBranchesCheckBox ==
+Configurar ramas después de crear la ruta
+
+== PartialWorkspaceStripLabel ==
+Este workspace está en modo parcial (artistas). [[UpdateWorkspace|Actualizar]] para cambiar a modo completo. Esta GUI no funciona bien en este modo
+
+== FullWorkspaceStripLabel ==
+Este workspace está en modo completo (desarrolladores). [[UpdateWorkspace|Actualizar]] para cambiar a modo parcial. Esta GUI no funciona bien en este modo
+
+== RemainingProgressMessage ==
+restante
+
+== DiffLinkButtonTooltip ==
+Copiar link para compartir el diff
+
+== MainWindowTitleForLinux ==
+Plastic SCM - wk: {0}
+
+== GluonFilePlasticLinkText ==
+Copiar link - obtén un link a este fichero para que puedas compartirlo fácilmente con otros
+
+== FileAlreadyExists ==
+El fichero {0} ya existe.
+
+== DirectoryAlreadyExists ==
+El directorio {0} ya existe.
+
+== OAuthSignInCheckMessage ==
+Esperando sesión...
+
+== RetrievingOrgsProgress ==
+Obteniendo organizaciones...
+
+== GettingSSOProviders ==
+Obteniendo los proveedores de la organización...
+
+== WaitingForSession ==
+Esperando sesión
+
+== CompleteSignInOnBrowser ==
+Completa el registro en tu navegador.
+
+== Or ==
+o
+
+== OrganizationNameWatermark ==
+El nombre de tu organización
+
+== SSOSignInTitle ==
+Iniciar sesión con Single Sign On
+
+== SignInToOrganization ==
+Iniciar sesión en {0}
+
+== NoProvidersForOrganization ==
+La organización especificada no ha habilitado el acceso por SSO
+
+== DontKnowOrganizationName ==
+No recuerdo el nombre de la organización
+
+== KnowOrganizationName ==
+Conozco el nombre de la organización
+
+== CompanyEmail ==
+Email de Empresa
+
+== SignInWithSingleSignOn ==
+Inicia sesión con Single Sign On
+
+== SentEmailStatement ==
+Sign in with Single Sign On
+
+== SentEmailStatementText ==
+Te hemos enviado un email a {0} indicándote las organizaciones a las que perteneces. Ábrelo e inicia sesión utilizando tu {1}
+
+== OrganizationNameStatementText ==
+nombre de organización.
+
+== SendingEmail ==
+Enviando email...
+
+== EmailNotSent ==
+No hemos podido enviar el email
+
+== SignInTo ==
+Inicia sesión en {0}
+
+== ConnectToServer ==
+Conectar a {0}
+
+== SignedInAs ==
+Conectado como {0}
+
+== SignInWasNotCompleted ==
+No se ha completado el inicio de sesión
+
+== OnDemandConnectionTypeHelp ==
+Bajo demanda: Usa esta opción si el servidor de Plastic SCM no está siempre disponible para este cliente y Plastic SCM no intentará conectarse a él de manera automática.
+
+== AutomaticConnectionTypeHelp ==
+Automática: Usa esta opción si el servidor está siempre online (tal vez en la misma red local, cuando te conectas desde un pc).
+
+== SignOut ==
+Desconectar
+
+== FastEnough ==
+¡Suficientemente rápido!
+
+== NotBad ==
+No está mal.
+
+== TooMuch ==
+Es demasiado.
+
+== ErrorAddPlasticSCMMenuItem ==
+Cannot add PlasticSCM menu item: {0} Method Menu.AddSubMenu not found
+
+== ErrorRemovePlasticSCMMenuItem ==
+Cannot remove PlasticSCM menu item: {0} Method MenuType.RemoveMenuItem not found
+
+== ErrorUpdatePlasticSCMMenus ==
+Cannot update all menus: Method EditorUtility.Internal_UpdateAllMenus not found
+
+== ErrorPlasticSCM ==
+Error - Plastic SCM
+
+== CheckoutButton ==
+Checkout
+
+== UpdateResultsError ==
+Some items were not correctly updated. You may want to check the errors and retry the operation after solving the problems
+
+== PluginModalInformation ==
+The modal dialog is not available in this version and it is required for the Plastic SCM plugin works fine. \n Please contact support@codicesoftware.com for further info.
+
+== ChangesetsCount ==
+{0} changesets
+
+== HideChanges ==
+Hide changes
+
+== ShowChanges ==
+Show changes
+
+== ChooseRepositoryTitle ==
+Choose repository
+
+== ExploreRepositories ==
+Explore repositories
+
+== WorkspacesExplanationLabel ==
+Workspaces are used to store the local copies of your project files that you can checkin to a repository.
+
+== RepositoryName ==
+Repository Name
+
+== RepositoryNameShortLabel ==
+Repository Name:
+
+== NewButton ==
+New
+
+== WorkPreferenceQuestion ==
+How do you prefer to work?
+
+== WorkPreferenceAnswerPlastic ==
+I need branching, merging and the ability to push/pull (Plastic workspace)
+
+== WorkPreferenceAnswerGluon ==
+I simply need to checkin my work (Gluon workspace)
+
+== CreateWorkspace ==
+Create workspace
+
+== LearnMoreDifferences ==
+Learn more about the differences between Plastic/Gluon workspaces <color=\"{0}\">{1}</color>
+
+== HereLink ==
+here.
+
+== PlasticSCMFullVsPartialWorkspaceLink ==
+https://www.plasticscm.com/book/#_full_workspaces_vs_partial_workspaces
+
+== SelectPathToRestore ==
+Select path to restore
+
+== SkipRestoreButton ==
+Skip
+
+== ChangesOfChangeset ==
+Changes of changeset {0}
+
+== UndoThisChangePlusMeta ==
+Undo this change +meta
+
+== UndoSelectedChanges ==
+Undo selected changes
+
+== UndoThisChange ==
+Undo this change
+
+== UndeleteRevisionPlusMeta ==
+Undelete revision +meta
+
+== UndeleteSelectedRevisions ==
+Undelete selected revisions
+
+== UndeleteRevisions ==
+Undelete revision
+
+== UndeleteRevisionPlusMetaPath ==
+Undelete revision +meta to specified path...
+
+== UndeleteSelectedRevisionsPaths ==
+Undelete selected revisions to specified paths...
+
+== UndeleteRevisionPath ==
+Undelete revision to specified path...
+
+== DiffMenuItem ==
+Diff
+
+== DiffMetaMenuItem ==
+Diff .meta
+
+== ViewHistoryMenuItem ==
+View file history
+
+== ViewHistoryMetaMenuItem ==
+View .meta file history
+
+== SolveConflictsInLable ==
+Solve conflicts in the directory structure first
+
+== PleaseComment ==
+Please comment on your checkin
+
+== CheckinHeader ==
+Checkin {0} of {1} item(s)
+
+== OpenMeta ==
+Open .meta
+
+== OpenMetaWith ==
+Open .meta with...
+
+== OpenMetaInExplorer ==
+Open .meta in explorer
+
+== UnderscoreDel ==
+_Del
+
+== DownloadingProgress ==
+Downloading
+
+== ConnectingError ==
+There was an error connecting. Please check your internet.
+
+== InstallingProgress ==
+Installing...
+
+== SkippingDownloadFileExists ==
+Skipping download. File {0} already exists
+
+== InstallPlasticSCM ==
+Install Plastic SCM
+
+== LoginOrSignUp ==
+Login or sign up
+
+== CreateAPlasticWorkspace ==
+ Create a Plastic workspace for this project
+
+== NextStepsToSetup ==
+ Next steps to complete setup
+
+== DownloadAndInstall ==
+ Download and install Plastic SCM (about 190MB)
+
+== LoginOrSignUpPlastic ==
+ Login or sign up for a Plastic account
+
+== WhichVersionInstall ==
+Which version do you want to install?
+
+* Cloud Edition is intended for for teams who usually work with a Cloud server.
+* Enterprise Edition is the choice for teams who work with on-premise servers.
+
+== PlasticSCM ==
+Plastic SCM
+
+== DownloadCloudEdition ==
+Download Cloud Edition
+
+== DownloadEnterpriseEdition ==
+Download Enterprise Edition
+
+== PrefixPlasticMenu ==
+Assets/Plastic SCM
+
+== PendingChangesPlasticMenu ==
+Show pending changes view
+
+== AddPlasticMenu ==
+Add to source control
+
+== CheckoutPlasticMenu ==
+Checkout
+
+== CheckinPlasticMenu ==
+Checkin
+
+== UndoPlasticMenu ==
+Undo changes
+
+== DiffPlasticMenu ==
+Diff with previous revision
+
+== HistoryPlasticMenu ==
+View file history
+
+== StatusCheckout ==
+Checked out
+
+== StatusConflicted ==
+Conflicted
+
+== StatusLockedMe ==
+Locked by me
+
+== StatusLockedRemote ==
+Locked remote
+
+== AssetOverlayTooltipStatus ==
+{0} by:
+
+== AssetOverlayTooltipWorkspace ==
+workspace {0}
+
+== SignUpUnityID ==
+Sign up with Unity ID
+
+== SignUpGoogle ==
+Sign up with Google
+
+== CannotAddVersionControl ==
+Cannot add files to Version Control: {0}
+
+== CannotDeleteVersionControl ==
+Cannot delete '{0}' in Version Control: {1}
+
+== CannotMoveVersionControl ==
+Cannot move '{0}' to '{1}' in Version Control: {2}
+
+== CannotCheckoutVersionControl ==
+Cannot checkout files in Version Control: {0}
+
+== ErrorGettingCredentialsCloudProject ==
+Error getting credentials to download Cloud Project: {0} ({1})
+
+== ErrorDownloadingCloudProject ==
+Error downloading Cloud Project: {0}
+
+== RuntimeVersionErrorFilesystemWatcher ==
+Plastic SCM: Detected an unsupported Runtime Version. The Plastic SCM Filesystem Watcher is not compatible with this runtime, and has been disabled.This can affect to the Pending Changes view performance, and also causes that the auto - refresh feature for views is disabled. We strongly recommend upgrading to the.NET 4.x equivalent Runtime Version for a better experience. In order to change the Runtime Version go Edit > Project Settings > Player > Other Settings > Configuration > Scripting Runtime Version.
+
+== ConfigureGluon ==
+Configure Gluon
+
+== LaunchBranchExplorer ==
+Launch branch explorer
+
+== LaunchPlasticButton ==
+Launch Plastic
+
+== CannotWriteCloudProjectId ==
+Cannot write cloudProjectId: Method PlayerSettings.SetCloudProjectId not found
+
+== PlasticConfigurationTitle ==
+Configure the connection to the Plastic SCM server
+
+== PlasticConfigurationExplanation ==
+Enter the server name or IP and the credentials
+
+== UnityDiffShortcut ==
+%d
+
+== UnityAssetDiffShortcut ==
+#%d
+
+== UnityHistoryShortcutForWindows ==
+%h
+
+== UnityHistoryShortcutForMacOS ==
+#%h
+
+== UnityDeleteShortcutForWindows ==
+_Del
+
+== UnityDeleteShortcutForMacOS ==
+%Del
+
+== UnityOpenShortcut ==
+#o
+
+== CheckingInFilesProgress ==
+Checking in files...
+
+== Files ==
+Files
+
+== UnityCheckinConflictsExplanation ==
+Some files you're trying to checkin are in conflict. You can resolve conflicts using the Incoming Changes view.
+
+== CheckinShowIncomingChangesView ==
+Show incoming changes view
+
+== UnityInitialCheckinComment ==
+Add packages and project settings to Plastic SCM.
+
+== UnityInitialCheckinProgress ==
+Checking in the packages and project settings files...
+
+== Default ==
+Por defecto
+
+== FileMerge ==
+File Merge
+
+== KDiff3 ==
+KDiff3
+
+== SemanticMerge ==
+Semantic Merge
+
+== UnitySmartMerge ==
+Unity Smart Merge
+
+== Custom ==
+Personalizada
+
+== NotCloudRepository ==
+El repositorio seleccionado debe ser un repositorio cloud
+
+== DisableAllHelpTips ==
+Deshabilitar toda la ayuda
diff --git a/Lib/Editor/PlasticSCM/localization/plastic-gui.es.txt.meta b/Lib/Editor/PlasticSCM/localization/plastic-gui.es.txt.meta
new file mode 100644
index 0000000..d533302
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/localization/plastic-gui.es.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 920353df495158e48b32b1372269c7ed
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/log4netPlastic.dll b/Lib/Editor/PlasticSCM/log4netPlastic.dll
new file mode 100644
index 0000000..c66ddb9
Binary files /dev/null and b/Lib/Editor/PlasticSCM/log4netPlastic.dll differ
diff --git a/Lib/Editor/PlasticSCM/log4netPlastic.dll.meta b/Lib/Editor/PlasticSCM/log4netPlastic.dll.meta
new file mode 100644
index 0000000..c85485a
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/log4netPlastic.dll.meta
@@ -0,0 +1,34 @@
+fileFormatVersion: 2
+guid: e60bdd1e4f6314d2382f323172110798
+timeCreated: 1540458896
+licenseType: Free
+PluginImporter:
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    data:
+      first:
+        Any: 
+      second:
+        enabled: 0
+        settings: {}
+    data:
+      first:
+        Editor: Editor
+      second:
+        enabled: 1
+        settings:
+          DefaultValueInitialized: true
+    data:
+      first:
+        Windows Store Apps: WindowsStoreApps
+      second:
+        enabled: 0
+        settings:
+          CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/lz4x64Plastic.dll b/Lib/Editor/PlasticSCM/lz4x64Plastic.dll
new file mode 100644
index 0000000..53740c6
Binary files /dev/null and b/Lib/Editor/PlasticSCM/lz4x64Plastic.dll differ
diff --git a/Lib/Editor/PlasticSCM/lz4x64Plastic.dll.meta b/Lib/Editor/PlasticSCM/lz4x64Plastic.dll.meta
new file mode 100644
index 0000000..ee75c68
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/lz4x64Plastic.dll.meta
@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: 074a5a5f34697b64c9b36dc09f6f7c32
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/unityplastic.dll b/Lib/Editor/PlasticSCM/unityplastic.dll
new file mode 100644
index 0000000..5aa155a
Binary files /dev/null and b/Lib/Editor/PlasticSCM/unityplastic.dll differ
diff --git a/Lib/Editor/PlasticSCM/unityplastic.dll.meta b/Lib/Editor/PlasticSCM/unityplastic.dll.meta
new file mode 100644
index 0000000..10a6d0d
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/unityplastic.dll.meta
@@ -0,0 +1,30 @@
+fileFormatVersion: 2
+guid: d93c07867b7df5b4eb9f104324c4fe5a
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Lib/Editor/PlasticSCM/zlib64Plastic.dll b/Lib/Editor/PlasticSCM/zlib64Plastic.dll
new file mode 100644
index 0000000..e267cc9
Binary files /dev/null and b/Lib/Editor/PlasticSCM/zlib64Plastic.dll differ
diff --git a/Lib/Editor/PlasticSCM/zlib64Plastic.dll.meta b/Lib/Editor/PlasticSCM/zlib64Plastic.dll.meta
new file mode 100644
index 0000000..98896b3
--- /dev/null
+++ b/Lib/Editor/PlasticSCM/zlib64Plastic.dll.meta
@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: 2f0909bef14cc58438d6fcea85ba8555
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/README.md b/README.md
index de0716f..2e45e2f 100644
--- a/README.md
+++ b/README.md
@@ -61,33 +61,34 @@ Here are some files and folders of note:
   ├── Third Party Notices.md
   ├── QAReport.md
   ├── Editor/
-  │   ├── Unity.SourceControl.asmdef
-  │   ├── Assets/
-  │   │   ├── Icons/
-  │   │   ├── Layouts/
-  │   │   ├── Styles/
-  │   │   └── UiConstants.cs
-  │   ├── Models/
-  │   │   ├── Api/
-  │   │   │   └── ISourceControlProvider.cs
-  │   │   └── Providers/
-  │   │       └── Collab.cs
-  │   ├── Views/
-  │   │   └── Adaptors/
-  │   ├── Presenters/
-  │   ├── Common/
-  │   ├── Settings/
-  │   ├── Components/
-  │   ├── Utilities/
-  │   └── UserInterface/
-  │       ├── Bootstrap.cs
-  │       ├── WindowCache.cs
-  │       ├── ToolbarButton.cs
-  │       └── CollaborateWindow.cs
+  │   └── Collaborate
+  │       ├── Unity.CollabProxy.Editor.asmdef
+  │       ├── Assets/
+  │       │   ├── Icons/
+  │       │   ├── Layouts/
+  │       │   ├── Styles/
+  │       │   └── UiConstants.cs
+  │       ├── Models/
+  │       │   ├── Api/
+  │       │   │   └── ISourceControlProvider.cs
+  │       │   └── Providers/
+  │       │       └── Collab.cs
+  │       ├── Views/
+  │       ├── Presenters/
+  │       ├── Common/
+  │       ├── Settings/
+  │       ├── Components/
+  │       ├── Utilities/
+  │       └── UserInterface/
+  │           ├── Bootstrap.cs
+  │           ├── WindowCache.cs
+  │           ├── ToolbarButton.cs
+  │           └── CollaborateWindow.cs
   ├── Tests/
-  │   ├── .tests.json
-  │   └── Editor/
-  │       └── Unity.CollabProxy.EditorTests.asmdef
+  │   ├── Collaborate
+  │   │   └── Editor/
+  │   │       └── Unity.CollabProxy.EditorTests.asmdef
+  │   └── .tests.json
   └── Documentation~/
        ├── unity-cloud-collaborate.md
        └── Images/
diff --git a/Tests/Editor/Collaborate.meta b/Tests/Editor/Collaborate.meta
new file mode 100644
index 0000000..f0773e2
--- /dev/null
+++ b/Tests/Editor/Collaborate.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a104f18619a7156469e9d97f767b4fda
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/Models.meta b/Tests/Editor/Collaborate/Models.meta
similarity index 100%
rename from Tests/Editor/Models.meta
rename to Tests/Editor/Collaborate/Models.meta
diff --git a/Tests/Editor/Models/ChangesModelTests.cs b/Tests/Editor/Collaborate/Models/ChangesModelTests.cs
similarity index 100%
rename from Tests/Editor/Models/ChangesModelTests.cs
rename to Tests/Editor/Collaborate/Models/ChangesModelTests.cs
diff --git a/Tests/Editor/Models/ChangesModelTests.cs.meta b/Tests/Editor/Collaborate/Models/ChangesModelTests.cs.meta
similarity index 100%
rename from Tests/Editor/Models/ChangesModelTests.cs.meta
rename to Tests/Editor/Collaborate/Models/ChangesModelTests.cs.meta
diff --git a/Tests/Editor/Models/HistoryModelTests.cs b/Tests/Editor/Collaborate/Models/HistoryModelTests.cs
similarity index 100%
rename from Tests/Editor/Models/HistoryModelTests.cs
rename to Tests/Editor/Collaborate/Models/HistoryModelTests.cs
diff --git a/Tests/Editor/Models/HistoryModelTests.cs.meta b/Tests/Editor/Collaborate/Models/HistoryModelTests.cs.meta
similarity index 100%
rename from Tests/Editor/Models/HistoryModelTests.cs.meta
rename to Tests/Editor/Collaborate/Models/HistoryModelTests.cs.meta
diff --git a/Tests/Editor/Models/Providers.meta b/Tests/Editor/Collaborate/Models/Providers.meta
similarity index 100%
rename from Tests/Editor/Models/Providers.meta
rename to Tests/Editor/Collaborate/Models/Providers.meta
diff --git a/Tests/Editor/Models/Providers/MockSourceControlProvider.cs b/Tests/Editor/Collaborate/Models/Providers/MockSourceControlProvider.cs
similarity index 100%
rename from Tests/Editor/Models/Providers/MockSourceControlProvider.cs
rename to Tests/Editor/Collaborate/Models/Providers/MockSourceControlProvider.cs
diff --git a/Tests/Editor/Models/Providers/MockSourceControlProvider.cs.meta b/Tests/Editor/Collaborate/Models/Providers/MockSourceControlProvider.cs.meta
similarity index 100%
rename from Tests/Editor/Models/Providers/MockSourceControlProvider.cs.meta
rename to Tests/Editor/Collaborate/Models/Providers/MockSourceControlProvider.cs.meta
diff --git a/Tests/Editor/Models/StartModelTests.cs b/Tests/Editor/Collaborate/Models/StartModelTests.cs
similarity index 100%
rename from Tests/Editor/Models/StartModelTests.cs
rename to Tests/Editor/Collaborate/Models/StartModelTests.cs
diff --git a/Tests/Editor/Models/StartModelTests.cs.meta b/Tests/Editor/Collaborate/Models/StartModelTests.cs.meta
similarity index 100%
rename from Tests/Editor/Models/StartModelTests.cs.meta
rename to Tests/Editor/Collaborate/Models/StartModelTests.cs.meta
diff --git a/Tests/Editor/Models/TestChangesModel.cs b/Tests/Editor/Collaborate/Models/TestChangesModel.cs
similarity index 100%
rename from Tests/Editor/Models/TestChangesModel.cs
rename to Tests/Editor/Collaborate/Models/TestChangesModel.cs
diff --git a/Tests/Editor/Models/TestChangesModel.cs.meta b/Tests/Editor/Collaborate/Models/TestChangesModel.cs.meta
similarity index 100%
rename from Tests/Editor/Models/TestChangesModel.cs.meta
rename to Tests/Editor/Collaborate/Models/TestChangesModel.cs.meta
diff --git a/Tests/Editor/Models/TestHistoryModel.cs b/Tests/Editor/Collaborate/Models/TestHistoryModel.cs
similarity index 100%
rename from Tests/Editor/Models/TestHistoryModel.cs
rename to Tests/Editor/Collaborate/Models/TestHistoryModel.cs
diff --git a/Tests/Editor/Models/TestHistoryModel.cs.meta b/Tests/Editor/Collaborate/Models/TestHistoryModel.cs.meta
similarity index 100%
rename from Tests/Editor/Models/TestHistoryModel.cs.meta
rename to Tests/Editor/Collaborate/Models/TestHistoryModel.cs.meta
diff --git a/Tests/Editor/Models/TestMainModel.cs b/Tests/Editor/Collaborate/Models/TestMainModel.cs
similarity index 100%
rename from Tests/Editor/Models/TestMainModel.cs
rename to Tests/Editor/Collaborate/Models/TestMainModel.cs
diff --git a/Tests/Editor/Models/TestMainModel.cs.meta b/Tests/Editor/Collaborate/Models/TestMainModel.cs.meta
similarity index 100%
rename from Tests/Editor/Models/TestMainModel.cs.meta
rename to Tests/Editor/Collaborate/Models/TestMainModel.cs.meta
diff --git a/Tests/Editor/Models/TestSourceControlProvider.cs b/Tests/Editor/Collaborate/Models/TestSourceControlProvider.cs
similarity index 100%
rename from Tests/Editor/Models/TestSourceControlProvider.cs
rename to Tests/Editor/Collaborate/Models/TestSourceControlProvider.cs
diff --git a/Tests/Editor/Models/TestSourceControlProvider.cs.meta b/Tests/Editor/Collaborate/Models/TestSourceControlProvider.cs.meta
similarity index 100%
rename from Tests/Editor/Models/TestSourceControlProvider.cs.meta
rename to Tests/Editor/Collaborate/Models/TestSourceControlProvider.cs.meta
diff --git a/Tests/Editor/Models/TestStartModel.cs b/Tests/Editor/Collaborate/Models/TestStartModel.cs
similarity index 100%
rename from Tests/Editor/Models/TestStartModel.cs
rename to Tests/Editor/Collaborate/Models/TestStartModel.cs
diff --git a/Tests/Editor/Models/TestStartModel.cs.meta b/Tests/Editor/Collaborate/Models/TestStartModel.cs.meta
similarity index 100%
rename from Tests/Editor/Models/TestStartModel.cs.meta
rename to Tests/Editor/Collaborate/Models/TestStartModel.cs.meta
diff --git a/Tests/Editor/Models/TestWindowCache.cs b/Tests/Editor/Collaborate/Models/TestWindowCache.cs
similarity index 100%
rename from Tests/Editor/Models/TestWindowCache.cs
rename to Tests/Editor/Collaborate/Models/TestWindowCache.cs
diff --git a/Tests/Editor/Models/TestWindowCache.cs.meta b/Tests/Editor/Collaborate/Models/TestWindowCache.cs.meta
similarity index 100%
rename from Tests/Editor/Models/TestWindowCache.cs.meta
rename to Tests/Editor/Collaborate/Models/TestWindowCache.cs.meta
diff --git a/Tests/Editor/Presenters.meta b/Tests/Editor/Collaborate/Presenters.meta
similarity index 100%
rename from Tests/Editor/Presenters.meta
rename to Tests/Editor/Collaborate/Presenters.meta
diff --git a/Tests/Editor/Presenters/ChangesPresenterTests.cs b/Tests/Editor/Collaborate/Presenters/ChangesPresenterTests.cs
similarity index 100%
rename from Tests/Editor/Presenters/ChangesPresenterTests.cs
rename to Tests/Editor/Collaborate/Presenters/ChangesPresenterTests.cs
diff --git a/Tests/Editor/Presenters/ChangesPresenterTests.cs.meta b/Tests/Editor/Collaborate/Presenters/ChangesPresenterTests.cs.meta
similarity index 100%
rename from Tests/Editor/Presenters/ChangesPresenterTests.cs.meta
rename to Tests/Editor/Collaborate/Presenters/ChangesPresenterTests.cs.meta
diff --git a/Tests/Editor/Presenters/HistoryPresenterTests.cs b/Tests/Editor/Collaborate/Presenters/HistoryPresenterTests.cs
similarity index 100%
rename from Tests/Editor/Presenters/HistoryPresenterTests.cs
rename to Tests/Editor/Collaborate/Presenters/HistoryPresenterTests.cs
diff --git a/Tests/Editor/Presenters/HistoryPresenterTests.cs.meta b/Tests/Editor/Collaborate/Presenters/HistoryPresenterTests.cs.meta
similarity index 100%
rename from Tests/Editor/Presenters/HistoryPresenterTests.cs.meta
rename to Tests/Editor/Collaborate/Presenters/HistoryPresenterTests.cs.meta
diff --git a/Tests/Editor/Presenters/MainPresenterTests.cs b/Tests/Editor/Collaborate/Presenters/MainPresenterTests.cs
similarity index 100%
rename from Tests/Editor/Presenters/MainPresenterTests.cs
rename to Tests/Editor/Collaborate/Presenters/MainPresenterTests.cs
diff --git a/Tests/Editor/Presenters/MainPresenterTests.cs.meta b/Tests/Editor/Collaborate/Presenters/MainPresenterTests.cs.meta
similarity index 100%
rename from Tests/Editor/Presenters/MainPresenterTests.cs.meta
rename to Tests/Editor/Collaborate/Presenters/MainPresenterTests.cs.meta
diff --git a/Tests/Editor/Presenters/StartPresenterTests.cs b/Tests/Editor/Collaborate/Presenters/StartPresenterTests.cs
similarity index 100%
rename from Tests/Editor/Presenters/StartPresenterTests.cs
rename to Tests/Editor/Collaborate/Presenters/StartPresenterTests.cs
diff --git a/Tests/Editor/Presenters/StartPresenterTests.cs.meta b/Tests/Editor/Collaborate/Presenters/StartPresenterTests.cs.meta
similarity index 100%
rename from Tests/Editor/Presenters/StartPresenterTests.cs.meta
rename to Tests/Editor/Collaborate/Presenters/StartPresenterTests.cs.meta
diff --git a/Tests/Editor/Presenters/TestChangesView.cs b/Tests/Editor/Collaborate/Presenters/TestChangesView.cs
similarity index 100%
rename from Tests/Editor/Presenters/TestChangesView.cs
rename to Tests/Editor/Collaborate/Presenters/TestChangesView.cs
diff --git a/Tests/Editor/Presenters/TestChangesView.cs.meta b/Tests/Editor/Collaborate/Presenters/TestChangesView.cs.meta
similarity index 100%
rename from Tests/Editor/Presenters/TestChangesView.cs.meta
rename to Tests/Editor/Collaborate/Presenters/TestChangesView.cs.meta
diff --git a/Tests/Editor/Presenters/TestHistoryView.cs b/Tests/Editor/Collaborate/Presenters/TestHistoryView.cs
similarity index 100%
rename from Tests/Editor/Presenters/TestHistoryView.cs
rename to Tests/Editor/Collaborate/Presenters/TestHistoryView.cs
diff --git a/Tests/Editor/Presenters/TestHistoryView.cs.meta b/Tests/Editor/Collaborate/Presenters/TestHistoryView.cs.meta
similarity index 100%
rename from Tests/Editor/Presenters/TestHistoryView.cs.meta
rename to Tests/Editor/Collaborate/Presenters/TestHistoryView.cs.meta
diff --git a/Tests/Editor/Presenters/TestMainView.cs b/Tests/Editor/Collaborate/Presenters/TestMainView.cs
similarity index 100%
rename from Tests/Editor/Presenters/TestMainView.cs
rename to Tests/Editor/Collaborate/Presenters/TestMainView.cs
diff --git a/Tests/Editor/Presenters/TestMainView.cs.meta b/Tests/Editor/Collaborate/Presenters/TestMainView.cs.meta
similarity index 100%
rename from Tests/Editor/Presenters/TestMainView.cs.meta
rename to Tests/Editor/Collaborate/Presenters/TestMainView.cs.meta
diff --git a/Tests/Editor/Presenters/TestStartView.cs b/Tests/Editor/Collaborate/Presenters/TestStartView.cs
similarity index 100%
rename from Tests/Editor/Presenters/TestStartView.cs
rename to Tests/Editor/Collaborate/Presenters/TestStartView.cs
diff --git a/Tests/Editor/Presenters/TestStartView.cs.meta b/Tests/Editor/Collaborate/Presenters/TestStartView.cs.meta
similarity index 100%
rename from Tests/Editor/Presenters/TestStartView.cs.meta
rename to Tests/Editor/Collaborate/Presenters/TestStartView.cs.meta
diff --git a/Tests/Editor/Scenario.meta b/Tests/Editor/Collaborate/Scenario.meta
similarity index 100%
rename from Tests/Editor/Scenario.meta
rename to Tests/Editor/Collaborate/Scenario.meta
diff --git a/Tests/Editor/Scenario/AsyncToCoroutine.cs b/Tests/Editor/Collaborate/Scenario/AsyncToCoroutine.cs
similarity index 100%
rename from Tests/Editor/Scenario/AsyncToCoroutine.cs
rename to Tests/Editor/Collaborate/Scenario/AsyncToCoroutine.cs
diff --git a/Tests/Editor/Scenario/AsyncToCoroutine.cs.meta b/Tests/Editor/Collaborate/Scenario/AsyncToCoroutine.cs.meta
similarity index 100%
rename from Tests/Editor/Scenario/AsyncToCoroutine.cs.meta
rename to Tests/Editor/Collaborate/Scenario/AsyncToCoroutine.cs.meta
diff --git a/Tests/Editor/Scenario/BasicTests.cs b/Tests/Editor/Collaborate/Scenario/BasicTests.cs
similarity index 100%
rename from Tests/Editor/Scenario/BasicTests.cs
rename to Tests/Editor/Collaborate/Scenario/BasicTests.cs
diff --git a/Tests/Editor/Scenario/BasicTests.cs.meta b/Tests/Editor/Collaborate/Scenario/BasicTests.cs.meta
similarity index 100%
rename from Tests/Editor/Scenario/BasicTests.cs.meta
rename to Tests/Editor/Collaborate/Scenario/BasicTests.cs.meta
diff --git a/Tests/Editor/ScenarioTestBase.cs b/Tests/Editor/Collaborate/ScenarioTestBase.cs
similarity index 100%
rename from Tests/Editor/ScenarioTestBase.cs
rename to Tests/Editor/Collaborate/ScenarioTestBase.cs
diff --git a/Tests/Editor/ScenarioTestBase.cs.meta b/Tests/Editor/Collaborate/ScenarioTestBase.cs.meta
similarity index 100%
rename from Tests/Editor/ScenarioTestBase.cs.meta
rename to Tests/Editor/Collaborate/ScenarioTestBase.cs.meta
diff --git a/Tests/Editor/TestConstants.cs b/Tests/Editor/Collaborate/TestConstants.cs
similarity index 100%
rename from Tests/Editor/TestConstants.cs
rename to Tests/Editor/Collaborate/TestConstants.cs
diff --git a/Tests/Editor/TestConstants.cs.meta b/Tests/Editor/Collaborate/TestConstants.cs.meta
similarity index 100%
rename from Tests/Editor/TestConstants.cs.meta
rename to Tests/Editor/Collaborate/TestConstants.cs.meta
diff --git a/Tests/Editor/TestHelpers.cs b/Tests/Editor/Collaborate/TestHelpers.cs
similarity index 100%
rename from Tests/Editor/TestHelpers.cs
rename to Tests/Editor/Collaborate/TestHelpers.cs
diff --git a/Tests/Editor/TestHelpers.cs.meta b/Tests/Editor/Collaborate/TestHelpers.cs.meta
similarity index 100%
rename from Tests/Editor/TestHelpers.cs.meta
rename to Tests/Editor/Collaborate/TestHelpers.cs.meta
diff --git a/Tests/Editor/TestWindow.cs b/Tests/Editor/Collaborate/TestWindow.cs
similarity index 100%
rename from Tests/Editor/TestWindow.cs
rename to Tests/Editor/Collaborate/TestWindow.cs
diff --git a/Tests/Editor/TestWindow.cs.meta b/Tests/Editor/Collaborate/TestWindow.cs.meta
similarity index 100%
rename from Tests/Editor/TestWindow.cs.meta
rename to Tests/Editor/Collaborate/TestWindow.cs.meta
diff --git a/Tests/Editor/UITestHelpers.cs b/Tests/Editor/Collaborate/UITestHelpers.cs
similarity index 100%
rename from Tests/Editor/UITestHelpers.cs
rename to Tests/Editor/Collaborate/UITestHelpers.cs
diff --git a/Tests/Editor/UITestHelpers.cs.meta b/Tests/Editor/Collaborate/UITestHelpers.cs.meta
similarity index 100%
rename from Tests/Editor/UITestHelpers.cs.meta
rename to Tests/Editor/Collaborate/UITestHelpers.cs.meta
diff --git a/Tests/Editor/Unity.CollabProxy.EditorTests.asmdef b/Tests/Editor/Collaborate/Unity.CollabProxy.EditorTests.asmdef
similarity index 100%
rename from Tests/Editor/Unity.CollabProxy.EditorTests.asmdef
rename to Tests/Editor/Collaborate/Unity.CollabProxy.EditorTests.asmdef
diff --git a/Tests/Editor/Unity.CollabProxy.EditorTests.asmdef.meta b/Tests/Editor/Collaborate/Unity.CollabProxy.EditorTests.asmdef.meta
similarity index 100%
rename from Tests/Editor/Unity.CollabProxy.EditorTests.asmdef.meta
rename to Tests/Editor/Collaborate/Unity.CollabProxy.EditorTests.asmdef.meta
diff --git a/Tests/Editor/PlasticSCM.meta b/Tests/Editor/PlasticSCM.meta
new file mode 100644
index 0000000..3d643d2
--- /dev/null
+++ b/Tests/Editor/PlasticSCM.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 015928784c946c147872bb8545628fb9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/AssetMenu.meta b/Tests/Editor/PlasticSCM/AssetMenu.meta
new file mode 100644
index 0000000..7854aa3
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/AssetMenu.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8d553feb6895d524faaab6ced320d321
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/AssetMenu/AssetMenuUpdaterTests.cs b/Tests/Editor/PlasticSCM/AssetMenu/AssetMenuUpdaterTests.cs
new file mode 100644
index 0000000..e2c442f
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/AssetMenu/AssetMenuUpdaterTests.cs
@@ -0,0 +1,482 @@
+using NUnit.Framework;
+
+using Unity.PlasticSCM.Editor;
+using Unity.PlasticSCM.Editor.AssetMenu;
+
+namespace Unity.PlasticSCM.Tests.Editor.AssetMenu
+{
+    [TestFixture]
+    class AssetMenuUpdaterTests
+    {
+        [Test]
+        public void TestCheckoutMenuEnabledForSingleSelection()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = true,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Checkout));
+        }
+
+        [Test]
+        public void TestCheckoutMenuEnabledForMultipleSelection()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 5,
+                IsFileSelection = true,
+                IsCheckedInSelection = true,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Checkout));
+        }
+
+        [Test]
+        public void TestCheckoutMenuDisabledForFolders()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = false,
+                IsCheckedInSelection = true,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Checkout));
+        }
+
+        [Test]
+        public void TestCheckoutMenuDisabledForAlreadyCheckedoutFiles()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = false,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Checkout));
+        }
+
+        [Test]
+        public void TestCheckoutMenuDisabledForNotControlledSelection()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = false,
+                IsControlledSelection = false,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Checkout));
+        }
+
+        [Test]
+        public void TestDiffMenuEnabledForCheckedInFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = true,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Diff));
+        }
+
+        [Test]
+        public void TestDiffMenuEnabledForCheckedOutFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = false,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Diff));
+        }
+
+        [Test]
+        public void TestDiffIsDisabledForFolders()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = false,
+                IsCheckedInSelection = false,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Diff));
+        }
+
+        [Test]
+        public void TestDiffIsDisabledForPrivateItems()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = false,
+                IsControlledSelection = false,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Diff));
+        }
+
+        [Test]
+        public void TestDiffMenuDisabledForMultipleSelection()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 5,
+                IsFileSelection = true,
+                IsCheckedInSelection = true,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Diff));
+        }
+
+        [Test]
+        public void TestDiffMenuDisabledForAddedFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = true,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = true,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Diff));
+        }
+
+        [Test]
+        public void TestHistoryMenuEnabledForCheckedInFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = true,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.History));
+        }
+
+        [Test]
+        public void TestHistoryMenuEnabledForCheckedOutFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = false,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.History));
+        }
+
+        [Test]
+        public void TestHistoryIsEnabledForFolders()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = false,
+                IsCheckedInSelection = false,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.History));
+        }
+
+        [Test]
+        public void TestHistoryIsDisabledForPrivateItems()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = false,
+                IsControlledSelection = false,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.History));
+        }
+
+        [Test]
+        public void TestHistoryMenuDisabledForMultipleSelection()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 5,
+                IsFileSelection = true,
+                IsCheckedInSelection = true,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.History));
+        }
+
+
+        [Test]
+        public void TestHistoryMenuDisabledForAddedFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsFileSelection = true,
+                IsCheckedInSelection = true,
+                IsControlledSelection = true,
+                HasAnyAddedInSelection = true,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.History));
+        }
+
+        [Test]
+        public void TestAddMenuEnabledForPrivateFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsPrivateSelection = true,
+                IsFileSelection = true,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Add));
+        }
+
+        [Test]
+        public void TestAddMenuEnabledForMultiplePrivate()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 5,
+                IsPrivateSelection = true,
+                IsFileSelection = true,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Add));
+        }
+
+        [Test]
+        public void TestAddMenuDisabledForControlledFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsPrivateSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Add));
+        }
+
+        [Test]
+        public void TestAddMenuDisabledForDirectory()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsPrivateSelection = true,
+                IsFileSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Add));
+        }
+
+        [Test]
+        public void TestCheckinMenuEnabledForNonCheckedInFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsControlledSelection = true,
+                IsCheckedOutSelection = true,
+                IsFileSelection = true,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Checkin));
+        }
+
+        [Test]
+        public void TestCheckinMenuDisabledForNotControlledSelection()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 5,
+                IsControlledSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Checkin));
+        }
+
+        [Test]
+        public void TestCheckinMenuDisabledForNotCheckedinFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsControlledSelection = true,
+                IsCheckedInSelection = true,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Checkin));
+        }
+
+        [Test]
+        public void TestCheckinMenuDisabledForDirectory()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsControlledSelection = true,
+                IsCheckedInSelection = false,
+                IsFileSelection = false
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Checkin));
+        }
+
+        [Test]
+        public void TestUndoMenuEnabledForNonCheckedInFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsControlledSelection = true,
+                IsCheckedOutSelection = true,
+                IsFileSelection = true,
+            };
+
+            Assert.IsTrue(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Undo));
+        }
+
+        [Test]
+        public void TestUndoMenuDisabledForNotControlledSelection()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 5,
+                IsControlledSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Undo));
+        }
+
+        [Test]
+        public void TestUndoMenuDisabledForNotCheckedinFile()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsControlledSelection = true,
+                IsCheckedInSelection = true,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Undo));
+        }
+
+        [Test]
+        public void TestUndoMenuDisabledForDirectory()
+        {
+            SelectedAssetGroupInfo groupInfo = new SelectedAssetGroupInfo()
+            {
+                SelectedCount = 1,
+                IsControlledSelection = true,
+                IsCheckedInSelection = false,
+                IsFileSelection = false,
+            };
+
+            Assert.IsFalse(
+                AssetMenuUpdater.GetAvailableMenuOperations(groupInfo)
+                .HasFlag(AssetMenuOperations.Undo));
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/AssetMenu/AssetMenuUpdaterTests.cs.meta b/Tests/Editor/PlasticSCM/AssetMenu/AssetMenuUpdaterTests.cs.meta
new file mode 100644
index 0000000..613f8d7
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/AssetMenu/AssetMenuUpdaterTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c736f932618521c42bb0a6a6e1ddc141
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/AssetMenu/SelectedAssetGroupInfoTests.cs b/Tests/Editor/PlasticSCM/AssetMenu/SelectedAssetGroupInfoTests.cs
new file mode 100644
index 0000000..ab9076e
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/AssetMenu/SelectedAssetGroupInfoTests.cs
@@ -0,0 +1,730 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using NUnit.Framework;
+
+using UnityEditor.VersionControl;
+
+using Codice.Client.Commands.WkTree;
+using Codice.CM.Common;
+using PlasticGui;
+
+using Unity.PlasticSCM.Editor.AssetMenu;
+using Unity.PlasticSCM.Tests.Editor.Mock;
+using Unity.PlasticSCM.Editor.AssetsOverlays;
+using Unity.PlasticSCM.Editor.AssetsOverlays.Cache;
+
+namespace Unity.PlasticSCM.Tests.Editor.AssetMenu
+{
+    [TestFixture]
+    class SelectedAssetGroupInfoTests
+    {
+        [Test]
+        public void TestSelectedCount()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.AreEqual(2, groupInfo.SelectedCount);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsCheckedInSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsTrue(groupInfo.IsCheckedInSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+
+        }
+
+        [Test]
+        public void TestIsNotCheckedInSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.CheckedOut();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsFalse(groupInfo.IsCheckedInSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsControlledSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsTrue(groupInfo.IsControlledSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsNotControlledSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsFalse(groupInfo.IsControlledSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestHasAnyAddedInSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.Added();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsTrue(groupInfo.HasAnyAddedInSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestHasAnyNoAddedInSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsFalse(groupInfo.HasAnyAddedInSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsFileSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsTrue(groupInfo.IsFileSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsNotFileSelection()
+        {
+            string barPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+
+                Directory.CreateDirectory(barPath);
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsFalse(groupInfo.IsFileSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+
+                if (Directory.Exists(barPath))
+                    Directory.Delete(barPath);
+            }
+        }
+
+        [Test]
+        public void TestHasNotAnyLockedRemoteInSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                AssetStatusCacheMock assetStatusCache = new AssetStatusCacheMock();
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        assetStatusCache);
+
+                Assert.IsFalse(groupInfo.HasAnyRemoteLockedInSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestHasAnyLockedRemoteInSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                AssetStatusCacheMock assetStatusCache = new AssetStatusCacheMock();
+
+                assetStatusCache.SetStatus(fooPath, AssetStatus.LockedRemote);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        assetStatusCache);
+
+                Assert.IsTrue(groupInfo.HasAnyRemoteLockedInSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsCheckedOutSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.CheckedOut();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.CheckedOut();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsTrue(groupInfo.IsCheckedOutSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsNotCheckedOutSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.CheckedOut();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsFalse(groupInfo.IsCheckedOutSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsPrivateSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, null);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, null);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsTrue(groupInfo.IsPrivateSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsNotPrivateSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Controlled();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, null);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsFalse(groupInfo.IsPrivateSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsAddedSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Added();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.Added();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsTrue(groupInfo.IsAddedSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        [Test]
+        public void TestIsNotAddedSelection()
+        {
+            try
+            {
+                PlasticApiMock apiMock = new PlasticApiMock();
+
+                Plastic.InitializeAPIForTesting(apiMock);
+
+                string fooPath = Path.Combine(Path.GetTempPath(), "foo.c");
+                string barPath = Path.Combine(Path.GetTempPath(), "bar.c");
+
+                Asset fooAsset = new Asset(fooPath);
+                Asset barAsset = new Asset(barPath);
+
+                WorkspaceTreeNode fooNode = BuildWorkspaceTreeNode.Added();
+                WorkspaceTreeNode barNode = BuildWorkspaceTreeNode.CheckedOut();
+
+                apiMock.SetupGetWorkspaceTreeNode(fooPath, fooNode);
+                apiMock.SetupGetWorkspaceTreeNode(barPath, barNode);
+                apiMock.SetupGetWorkingBranch(new BranchInfo());
+
+                AssetList assetList = new AssetList();
+                assetList.Add(fooAsset);
+                assetList.Add(barAsset);
+
+                SelectedAssetGroupInfo groupInfo =
+                    SelectedAssetGroupInfo.BuildFromAssetList(
+                        assetList,
+                        new AssetStatusCacheMock());
+
+                Assert.IsFalse(groupInfo.IsAddedSelection);
+            }
+            finally
+            {
+                Plastic.InitializeAPIForTesting(new PlasticAPI());
+            }
+        }
+
+        class AssetStatusCacheMock : IAssetStatusCache
+        {
+            internal void SetStatus(string fullPath, AssetStatus status)
+            {
+                mData.Add(fullPath, status);
+            }
+
+            AssetStatus IAssetStatusCache.GetStatusForPath(string fullPath)
+            {
+                AssetStatus status = AssetStatus.None;
+
+                mData.TryGetValue(fullPath, out status);
+
+                return status;
+            }
+
+            AssetStatus IAssetStatusCache.GetStatusForGuid(string guid)
+            {
+                return AssetStatus.None;
+            }
+
+            LockStatusData IAssetStatusCache.GetLockStatusData(string guid)
+            {
+                return null;
+            }
+            LockStatusData IAssetStatusCache.GetLockStatusDataForPath(string path)
+            {
+                return null;
+            }
+
+            void IAssetStatusCache.Clear()
+            {
+                mData.Clear();
+            }
+
+            Dictionary<string, AssetStatus> mData =
+                new Dictionary<string, AssetStatus>();
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/AssetMenu/SelectedAssetGroupInfoTests.cs.meta b/Tests/Editor/PlasticSCM/AssetMenu/SelectedAssetGroupInfoTests.cs.meta
new file mode 100644
index 0000000..98f917e
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/AssetMenu/SelectedAssetGroupInfoTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9ee0fb324c7b1814792c151b444bf797
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Mock.meta b/Tests/Editor/PlasticSCM/Mock.meta
new file mode 100644
index 0000000..6f8f2c2
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Mock.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 166cf3da6b00b9d4489bedba321100f5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Mock/BuildWorkspaceTreeNode.cs b/Tests/Editor/PlasticSCM/Mock/BuildWorkspaceTreeNode.cs
new file mode 100644
index 0000000..9a548ac
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Mock/BuildWorkspaceTreeNode.cs
@@ -0,0 +1,43 @@
+using Codice.Client.Commands.WkTree;
+using Codice.CM.Common;
+
+namespace Unity.PlasticSCM.Tests.Editor.Mock
+{
+    internal static class BuildWorkspaceTreeNode
+    {
+        internal static WorkspaceTreeNode Controlled()
+        {
+            return new WorkspaceTreeNode()
+            {
+                RevInfo = new RevisionInfo()
+                {
+                    ParentId = 156,
+                }
+            };
+        }
+
+        internal static WorkspaceTreeNode CheckedOut()
+        {
+            return new WorkspaceTreeNode()
+            {
+                RevInfo = new RevisionInfo()
+                {
+                    CheckedOut = true,
+                    ParentId = 156,
+                }
+            };
+        }
+
+        internal static WorkspaceTreeNode Added()
+        {
+            return new WorkspaceTreeNode()
+            {
+                RevInfo = new RevisionInfo()
+                {
+                    CheckedOut = true,
+                    ParentId = -1,
+                }
+            };
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/Mock/BuildWorkspaceTreeNode.cs.meta b/Tests/Editor/PlasticSCM/Mock/BuildWorkspaceTreeNode.cs.meta
new file mode 100644
index 0000000..b81f567
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Mock/BuildWorkspaceTreeNode.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5cc436884e444884684e0ebe12817806
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Mock/PlasticApiMock.cs b/Tests/Editor/PlasticSCM/Mock/PlasticApiMock.cs
new file mode 100644
index 0000000..1bd5fc2
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Mock/PlasticApiMock.cs
@@ -0,0 +1,990 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.BaseCommands.Acl;
+using Codice.Client.BaseCommands.BranchExplorer.ExplorerTree;
+using Codice.Client.BaseCommands.BranchExplorer.Layout;
+using Codice.Client.Commands;
+using Codice.Client.Commands.CheckIn;
+using Codice.Client.Commands.Tree;
+using Codice.Client.Commands.WkTree;
+using Codice.Client.Commands.Xlinks;
+using Codice.Client.Common;
+using Codice.Client.Common.Xlinks;
+using Codice.Client.GameUI.Update;
+using Codice.Client.IssueTracker;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using Codice.CM.Common.Replication;
+using Codice.CM.Common.Serialization;
+using Codice.CM.Common.Tree;
+using PlasticGui;
+using PlasticGui.SwitcherWindow.Workspaces;
+using PlasticGui.WorkspaceWindow.BranchExplorer;
+using PlasticGui.WorkspaceWindow.Diff;
+
+namespace Unity.PlasticSCM.Tests.Editor.Mock
+{
+    internal class PlasticApiMock : IPlasticAPI
+    {
+        internal void SetupGetWorkspaceTreeNode(string path, WorkspaceTreeNode wkTreeNode)
+        {
+            mWorkspaceTreeNodes.Add(path, wkTreeNode);
+        }
+
+        internal void SetupGetWorkingBranch(BranchInfo workingBranch)
+        {
+            mWorkingBranch = workingBranch;
+        }
+
+        WkAddResult IPlasticAPI.Add(string[] paths, AddOptions options, out IList checkouts)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.AddLockRule(RepositorySpec repSpec, string newRule, bool bDryRun)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.ApplyLabelToWorkspace(WorkspaceInfo wkInfo, RepositorySpec repSpec, MarkerInfo labelInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        DiffInfo IPlasticAPI.BuildDiffInfoForDiffWithPrevious(string revspec2, string symbolicName2, string defaultPath2, string fileExt, WorkspaceInfo currentWk)
+        {
+            throw new NotImplementedException();
+        }
+
+        OutOfDateItems IPlasticAPI.CalculateOutOfDateItems(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        EnumRevisionType IPlasticAPI.ChangeRevisionType(string path, EnumRevisionType type)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.CheckAttributeExists(RepositorySpec repSpec, string attributeName)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.CheckBranchExists(RepositorySpec repSpec, BranchInfo brInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.CheckCredentials(string server, SEIDWorkingMode mode, string user, string password)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.CheckLabelExists(RepositorySpec repSpec, MarkerInfo mkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.Checkout(string[] paths)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.Checkout(string[] paths, CheckoutModifiers options)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.CheckRepositoryExists(string repServer, string repName)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.CheckServerConnection(string repServer)
+        {
+            throw new NotImplementedException();
+        }
+
+        AttributeInfo IPlasticAPI.CreateAttribute(RepositorySpec repSpec, string attributeName, string attributeComment)
+        {
+            throw new NotImplementedException();
+        }
+
+        ICheckinOperation IPlasticAPI.CreateCheckInOperation()
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.CreateChildBranch(WorkspaceInfo wkInfo, BranchInfo branchInfo, string title)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.CreateChildBranch(RepositorySpec repSpec, BranchInfo parentBranchInfo, string name, string comment)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.CreateChildBranchFromChangeset(RepositorySpec repSpec, BranchInfo parentBranchInfo, long changeset, string name)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.CreateChildBranchFromChangeset(RepositorySpec repSpec, BranchInfo parentBranchInfo, long changeset, string name, string comment)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.CreateComment(RepositorySpec repSpec, long reviewId, CodeReviewCommentInfo comment)
+        {
+            throw new NotImplementedException();
+        }
+
+        RepositoryInfo IPlasticAPI.CreateRepository(string repServer, string repName)
+        {
+            throw new NotImplementedException();
+        }
+
+        ReviewInfo IPlasticAPI.CreateReview(RepositorySpec repSpec, ReviewInfo reviewInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        WorkspaceInfo IPlasticAPI.CreateWorkspace(string wkPath, string wkName, string repName)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.DeleteAttributeFromObject(RepositorySpec repSpec, AttributeRealizationInfo attribute)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.DeleteBranch(WorkspaceInfo wkInfo, RepositorySpec repSpec, BranchInfo branchInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.DeleteChangeset(RepositorySpec repSpec, ChangesetInfo changesetInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.DeleteComment(RepositorySpec repSpec, long commentId)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.DeleteControlled(string path, DeleteModifiers options)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.DeleteLabel(RepositorySpec repSpec, MarkerInfo labelInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.DeleteReview(RepositorySpec repSpec, ReviewInfo reviewInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.DoGetAllRepositories(string server, bool bFilterDeleted)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.FindAttributeTypes(RepositorySpec repSpec)
+        {
+            throw new NotImplementedException();
+        }
+
+        HashSet<Guid> IPlasticAPI.FindGuids(RepositorySpec repSpec, WorkspaceInfo wkInfo, string condition, ObjectType objectType)
+        {
+            throw new NotImplementedException();
+        }
+
+        QueryResult IPlasticAPI.FindQuery(WorkspaceInfo wkInfo, string query)
+        {
+            throw new NotImplementedException();
+        }
+
+        QueryResult IPlasticAPI.FindQuery(RepositoryInfo repInfo, string query)
+        {
+            throw new NotImplementedException();
+        }
+
+        QueryResult IPlasticAPI.FindQuery(RepositorySpec repSpec, string query)
+        {
+            throw new NotImplementedException();
+        }
+
+        DiffInfo IPlasticAPI.GetAddedDiffInfo(WorkspaceInfo wkInfo, MountPoint mount, DiffViewEntry entry, WorkspaceInfo currentWk)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.GetAllRepositories(bool bFilterDeleted)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.GetAllRepositories(string server, bool bFilterDeleted)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.GetAllRepositories(string server, bool bFilterDeleted, ServerProfile profile)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<WorkspaceGuiEntry> IPlasticAPI.GetAllWorkspaces()
+        {
+            throw new NotImplementedException();
+        }
+
+        WorkspaceInfo[] IPlasticAPI.GetAllWorkspacesArray()
+        {
+            throw new NotImplementedException();
+        }
+
+        List<AnnotatedLine> IPlasticAPI.GetAnnotations(RepositorySpec repSpec, RevisionInfo revInfo, string localPath, string comparisonMethod, string encoding)
+        {
+            throw new NotImplementedException();
+        }
+
+        AttributeInfo IPlasticAPI.GetAttribute(string server, RepId repId, string attributeName)
+        {
+            throw new NotImplementedException();
+        }
+
+        long IPlasticAPI.GetAttributeIdForRepository(RepositorySpec repSpec, string attributeName)
+        {
+            throw new NotImplementedException();
+        }
+
+        AttributeRealizationInfo[] IPlasticAPI.GetAttributeRealizations(RepositorySpec repSpec, long objId)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<ClientDiff> IPlasticAPI.GetBranchDifferences(RepositorySpec repSpec, BranchInfo brInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        BrExLayout IPlasticAPI.GetBranchExplorerLayout(WorkspaceInfo wkInfo, RepositorySpec repSpec, FilterCollection filters, DisplayOptions options, out BrExTree explorerTree)
+        {
+            throw new NotImplementedException();
+        }
+
+        BrExLayout IPlasticAPI.GetBranchExplorerLayout(WorkspaceInfo wkInfo, RepositoryExplainMergeData explainMergeData, DisplayOptions displayOptions, out BrExTree explorerTree)
+        {
+            throw new NotImplementedException();
+        }
+
+        BrExLayout IPlasticAPI.GetBranchExplorerLayout(RepositorySpec repSpec, BrExTree explorerTree, DisplayOptions options)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.GetBranchInfo(RepositorySpec repSpec, string fullBranchName)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.GetBranchInfo(RepositorySpec repSpec, Guid brId)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<BranchInfo> IPlasticAPI.GetBranchInfos(RepositorySpec repSpec, List<long> ids)
+        {
+            throw new NotImplementedException();
+        }
+
+        Difference IPlasticAPI.GetChangedForMovedDifference(Difference diff)
+        {
+            throw new NotImplementedException();
+        }
+
+        TreeChangedNode IPlasticAPI.GetChangedNodeForPath(WorkspaceInfo wkInfo, string path)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList<ChangeInfo> IPlasticAPI.GetChanges(WorkspaceInfo wkInfo, List<string> basePaths, WorkspaceStatusOptions options)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<ClientDiff> IPlasticAPI.GetChangesetDifferences(RepositorySpec repSpec, ChangesetInfo csetInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<ClientDiff> IPlasticAPI.GetChangesetDifferences(MountPointWithPath mount, ChangesetInfo csetInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        Guid IPlasticAPI.GetChangesetGuid(RepositorySpec repSpec, long changesetId)
+        {
+            throw new NotImplementedException();
+        }
+
+        ChangesetInfo IPlasticAPI.GetChangesetInfo(RepositorySpec repSpec, Guid csetId)
+        {
+            throw new NotImplementedException();
+        }
+
+        ChangesetInfo IPlasticAPI.GetChangesetInfoFromId(WorkspaceInfo wkInfo, long csId)
+        {
+            throw new NotImplementedException();
+        }
+
+        ChangesetInfo IPlasticAPI.GetChangesetInfoFromId(RepositorySpec repSpec, long csId)
+        {
+            throw new NotImplementedException();
+        }
+
+        ChangesetInfo IPlasticAPI.GetChangesetInfoFromId(RepositoryInfo repInfo, long csId)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<ClientDiff> IPlasticAPI.GetChangesetsDifferences(RepositorySpec repSpec, ChangesetInfo sourceCsetInfo, ChangesetInfo destinationCsetInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        long IPlasticAPI.GetCurrentChangesetOnWorkspace(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        DiffInfo IPlasticAPI.GetDiffInfo(string revSpec, string symbolicName, string defaultPath, string fileExtension, WorkspaceInfo currrentWk)
+        {
+            throw new NotImplementedException();
+        }
+
+        DiffInfo IPlasticAPI.GetDiffInfo(string revspec1, string revspec2, string symbolicName1, string symbolicName2, string defaultPath1, string defaultPath2, string fileExtension, WorkspaceInfo currrentWk)
+        {
+            throw new NotImplementedException();
+        }
+
+        DiffInfo IPlasticAPI.GetDiffInfo(WorkspaceInfo wkInfo, ChangeInfo changeInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        DiffInfo IPlasticAPI.GetDiffInfo(WorkspaceInfo wkInfo, ChangeInfo changeInfo, ChangeInfo changedForMoved)
+        {
+            throw new NotImplementedException();
+        }
+
+        DiffInfo IPlasticAPI.GetDiffInfo(WorkspaceInfo wkInfo, MountPoint mount, Difference diff)
+        {
+            throw new NotImplementedException();
+        }
+
+        DiffInfo IPlasticAPI.GetDiffInfo(WorkspaceInfo wkInfo, RepositorySpec repSpec, RevisionInfo leftRev, RevisionInfo rightRev, string leftDefaultPath, string rightDefaultPath)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<RepObjectInfo> IPlasticAPI.GetHistory(RepositorySpec repSpec, long itemId)
+        {
+            throw new NotImplementedException();
+        }
+
+        HumanReadableXlinkDataGenerator IPlasticAPI.GetHumanReadableXlinkDataGenerator()
+        {
+            throw new NotImplementedException();
+        }
+
+        IDictionary<MountPoint, PendingMergeLink> IPlasticAPI.GetInProgressMergeLinks(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        LicenseData IPlasticAPI.GetLicenseData(string server)
+        {
+            throw new NotImplementedException();
+        }
+
+        long IPlasticAPI.GetLoadedChangeset(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        long IPlasticAPI.GetLoadedRevisionId(WorkspaceInfo wkInfo, RepositorySpec repSpec, long itemId)
+        {
+            throw new NotImplementedException();
+        }
+
+        LockRule IPlasticAPI.GetLockRule(RepositorySpec repSpec)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.GetMainBranch(RepositorySpec repSpec)
+        {
+            throw new NotImplementedException();
+        }
+
+        MarkerInfo IPlasticAPI.GetMarkerInfo(RepositorySpec repSpec, long markerId)
+        {
+            throw new NotImplementedException();
+        }
+
+        Guid IPlasticAPI.GetObjectGuid(RepositorySpec repSpec, long objectId)
+        {
+            throw new NotImplementedException();
+        }
+
+        long IPlasticAPI.GetParentChangeset(RepositorySpec repSpec, long changesetId)
+        {
+            throw new NotImplementedException();
+        }
+
+        RevisionInfo IPlasticAPI.GetParentRevision(RepositorySpec repSpec, RevisionInfo revInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        IDictionary<MountPoint, IList<PendingMergeLink>> IPlasticAPI.GetPendingMergeLinks(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList<ReplicationSourceInfo> IPlasticAPI.GetReplicationSources(RepositorySpec repSpec, RepObjectInfo repObject)
+        {
+            throw new NotImplementedException();
+        }
+
+        RepositoryInfo IPlasticAPI.GetRepositoryInfo(RepositorySpec repSpec)
+        {
+            throw new NotImplementedException();
+        }
+
+        RepositorySpec IPlasticAPI.GetRepositorySpec(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.GetReviewComments(RepositorySpec repSpec, long reviewId)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.GetReviewCommentsFromReviewIds(RepositorySpec repSpec, List<long> reviewIds)
+        {
+            throw new NotImplementedException();
+        }
+
+        RevisionInfo IPlasticAPI.GetRevisionAtChangeset(RepositorySpec repSpec, long itemId, long changesetId)
+        {
+            throw new NotImplementedException();
+        }
+
+        ChildItem[] IPlasticAPI.GetRevisionChildren(RepositorySpec repSpec, RevisionInfo revInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.GetRevisionDataToFile(RepositorySpec repSpec, HistoryRevision revision, string tmpFile)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.GetRevisionDataToFile(RepositorySpec repSpec, RevisionInfo revInfo, string tmpFile)
+        {
+            throw new NotImplementedException();
+        }
+
+        RevisionInfo IPlasticAPI.GetRevisionInfo(RepositorySpec repSpec, long revisionId)
+        {
+            throw new NotImplementedException();
+        }
+
+        RepositoryInfo IPlasticAPI.GetRootRepositoryInfo(string clientPath)
+        {
+            throw new NotImplementedException();
+        }
+
+        SEID IPlasticAPI.GetSeidFromName(string server, string name, bool isGroup)
+        {
+            throw new NotImplementedException();
+        }
+
+        SelectorInformation IPlasticAPI.GetSelectorUserInformation(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        int IPlasticAPI.GetServerWebPort(string server)
+        {
+            throw new NotImplementedException();
+        }
+
+        ReplicationLogEntryInfo[] IPlasticAPI.GetSortedReplicationLogsFromBranch(RepositorySpec repSpec, BranchInfo branchInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        ReplicationLogEntryInfo[] IPlasticAPI.GetSortedReplicationLogsFromRepository(RepositorySpec repSpec)
+        {
+            throw new NotImplementedException();
+        }
+
+        TreeContent IPlasticAPI.GetTreeContent(RepositorySpec repSpec, long changesetId)
+        {
+            throw new NotImplementedException();
+        }
+
+        string IPlasticAPI.GetUserName(SEID owner)
+        {
+            throw new NotImplementedException();
+        }
+
+        string IPlasticAPI.GetUserName(string server, SEID owner)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.GetValuesForAttribute(string server, RepId repId, string attributeName)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.GetWorkingBranch(WorkspaceInfo wkInfo)
+        {
+            return mWorkingBranch;
+        }
+
+        BranchInfo IPlasticAPI.GetCheckoutBranch(WorkspaceInfo wkInfo)
+        {
+            return mWorkingBranch;
+        }
+
+        long IPlasticAPI.GetWorkingChangeset(RepositorySpec repSpec, WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        SEIDWorkingMode IPlasticAPI.GetWorkingMode(string server)
+        {
+            throw new NotImplementedException();
+        }
+
+        WorkspaceInfo IPlasticAPI.GetWorkspaceFromPath(string wkPath)
+        {
+            throw new NotImplementedException();
+        }
+
+        WorkspaceTreeNode IPlasticAPI.GetWorkspaceTree(WorkspaceInfo wkInfo, string path)
+        {
+            throw new NotImplementedException();
+        }
+
+        WorkspaceTreeNode IPlasticAPI.GetWorkspaceTreeNode(string path)
+        {
+            if (!mWorkspaceTreeNodes.ContainsKey(path))
+                return null;
+
+            return mWorkspaceTreeNodes[path];
+        }
+
+        List<ClientXlink> IPlasticAPI.GetXLinksInChangesetTree(RepositorySpec repSpec, long changesetId)
+        {
+            throw new NotImplementedException();
+        }
+
+        string IPlasticAPI.GetXlinkTypeString(Xlink xlink)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.HasWorkspaceMergeChanges(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsBranchEmpty(RepositorySpec repSpec, long branchId)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsCopied(string path, out bool bReplaced)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsFsReaderWatchLimitReached(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsGluonWorkspace(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsIncomingChangesInProgress(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsMovedChangedDifference(Difference diff)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsOnChangedTree(WorkspaceInfo wkInfo, string path)
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsReadOnlyFilesPreferenceEnabled()
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsStackTraceEnabled()
+        {
+            throw new NotImplementedException();
+        }
+
+        bool IPlasticAPI.IsWorkingChangesetDeleted(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.LaunchDifferences(DiffInfo diffInfo, IToolLauncher xDiffLauncher)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<PlasticTask> IPlasticAPI.LoadTasks(IPlasticIssueTrackerExtension extension, List<string> taskIds)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.MarkTaskAsOpen(IPlasticIssueTrackerExtension extension, List<string> taskIds, string assignee)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.MkBranch(RepositorySpec repSpec, string fullBranchName, long changeset, string comment)
+        {
+            throw new NotImplementedException();
+        }
+
+        MarkerInfo IPlasticAPI.MkLabel(RepositorySpec repSpec, string labelName, long changeset, string comment)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.MkLabelInAllXlinkedRepositories(IList<ClientXlink> targetXlinks, string labelName, string comment)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.Move(string source, string destination, MoveModifiers options)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.MoveChangeset(RepositorySpec repSpec, ChangesetInfo csetInfo, BranchInfo dstBrInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<ErrorMessage> IPlasticAPI.PartialUpdate(WorkspaceInfo wkInfo, List<string> paths)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.PerformUpdateMerge(WorkspaceInfo wkInfo, MergeSource mergeSource, MergeResult mergeResult, ICmdNotifier notifier)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.RemoveRepository(RepositoryInfo repInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.RemoveWorkspace(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo IPlasticAPI.RenameBranch(WorkspaceInfo wkInfo, RepositorySpec repSpec, BranchInfo branchInfo, string newName)
+        {
+            throw new NotImplementedException();
+        }
+
+        MarkerInfo IPlasticAPI.RenameLabel(WorkspaceInfo wkInfo, RepositorySpec repSpec, MarkerInfo labelInfo, string newName)
+        {
+            throw new NotImplementedException();
+        }
+
+        RepositoryInfo IPlasticAPI.RenameRepository(RepositoryInfo repInfo, string newName)
+        {
+            throw new NotImplementedException();
+        }
+
+        WorkspaceInfo IPlasticAPI.RenameWorkspace(WorkspaceInfo wkInfo, string newName)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.RevertToClientDiffRevisions(WorkspaceInfo wkInfo, ClientDiffInfo clientDiff, WorkspaceTreeNode wkNode, string workspacePath)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.RevertToThisRevision(WorkspaceInfo wkInfo, RepositorySpec repSpec, HistoryRevision revision, string path)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<ChangeInfo> IPlasticAPI.SearchMatches(WorkspaceInfo wkInfo, string path, double allowedChangesPerUnit)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList IPlasticAPI.SelectiveUpdate(WorkspaceInfo wkInfo, UpdateFlags flags, IList dirs, IList files)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.SetAsGluonWorkspace(WorkspaceInfo wkInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.SetAttribute(RepositorySpec repSpec, long attId, long objId, string attributeValue)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.SetReadonlyFilesPreference(bool value)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.SetSelector(WorkspaceInfo wkInfo, string selector, SetSelectorFlags flags)
+        {
+            throw new NotImplementedException();
+        }
+
+        CheckinResult IPlasticAPI.ShelveChanges(string[] paths, string comment)
+        {
+            throw new NotImplementedException();
+        }
+
+        IUpdateResult IPlasticAPI.SwitchToBranch(WorkspaceInfo wkInfo, RepositorySpec repSpec, BranchInfo brInfo, IContinueWithPendingChangesQuestioner questioner, ICmdNotifier notifier)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.SwitchToBranch(WorkspaceInfo wkInfo, BranchInfo branchInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        IUpdateResult IPlasticAPI.SwitchToChangeset(WorkspaceInfo wkInfo, RepositorySpec repSpec, BranchInfo brInfo, ChangesetInfo csInfo, IContinueWithPendingChangesQuestioner questioner, ICmdNotifier notifier)
+        {
+            throw new NotImplementedException();
+        }
+
+        IUpdateResult IPlasticAPI.SwitchToLabel(WorkspaceInfo wkInfo, RepositorySpec repSpec, MarkerInfo labelInfo, IContinueWithPendingChangesQuestioner questioner, ICmdNotifier notifier)
+        {
+            throw new NotImplementedException();
+        }
+
+        string IPlasticAPI.SwitchWorkspaceSelector(WorkspaceInfo wkInfo, SwitchToSelectorEntry[] entries)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UndeleteClientDiff(ClientDiffInfo diff, string restorePath)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UndeleteRepository(RepositoryInfo repInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UndeleteRevision(RepositorySpec repSpec, RemovedRealizationInfo removed, string restorePath)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UndoCheckout(WorkspaceInfo wkInfo, string[] paths, ICmdNotifier notifier)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UndoCheckout(WorkspaceInfo wkInfo, IList<string> paths, IList<string> skippedLocks, bool bHandleDeletedChangeset)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UndoShelvedChanges(WorkspaceInfo wkInfo, string[] paths)
+        {
+            throw new NotImplementedException();
+        }
+
+        List<string> IPlasticAPI.UndoUnchanged(WorkspaceInfo wkInfo, IList paths)
+        {
+            throw new NotImplementedException();
+        }
+
+        IUpdateResult IPlasticAPI.Update(string path, UpdateFlags flags, IRunMergeDuringUpdate mergeController, ICmdNotifier notifier)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UpdateBranchHead(RepositorySpec repSpec, long branchId, long changesetId)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UpdateCheckoutBranch(WorkspaceInfo wkInfo, BranchInfo branchInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        ReviewCommentInfo IPlasticAPI.UpdateComment(RepositorySpec repSpec, ReviewCommentInfo editedComment)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UpdateObjectComment(RepositorySpec repSpec, RepObjectInfo repObject, string newComment)
+        {
+            throw new NotImplementedException();
+        }
+
+        ReviewInfo IPlasticAPI.UpdateReview(RepositorySpec repSpec, ReviewInfo reviewInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        IUpdateResult IPlasticAPI.UpdateToLatest(WorkspaceInfo wkInfo, UpdateFlags flags, IRunMergeDuringUpdate mergeController, ICmdNotifier notifier)
+        {
+            throw new NotImplementedException();
+        }
+
+        SecurityMember[] IPlasticAPI.GetUsers(string server, string serverSideFilter)
+        {
+            throw new NotImplementedException();
+        }
+
+        SecurityMember[] IPlasticAPI.GetGroups(string server, string serverSideFilter)
+        {
+            throw new NotImplementedException();
+        }
+
+        SecurityMember[] IPlasticAPI.GetSecurityMembers(string server, string serverSideFilter)
+        {
+            throw new NotImplementedException();
+        }
+
+        SecurityMember IPlasticAPI.GetSecurityMemberFromName(string server, string name)
+        {
+            throw new NotImplementedException();
+        }
+
+        WorkspaceInfo IPlasticAPI.CreateDynamicWorkspace(string wkPath, string wkName, string repName)
+        {
+            throw new NotImplementedException();
+        }
+
+        RepositoryServerInfo IPlasticAPI.GetRepositoryServerInfo(string server)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.UpdateSecuredPath(RepositorySpec repSpec, SecuredPathInfo secPathInfo, long[] newBrIds, AclParams aclParams)
+        {
+            throw new NotImplementedException();
+        }
+
+        SecuredPathInfo IPlasticAPI.CreateSecuredPath(RepositorySpec repSpec, string path, string tag, long[] brIds, AclParams aclParams)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.DeleteSecuredPath(RepositorySpec repSpec, SecuredPathInfo secPathInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.CalculateAcl(string server, ObjectInfo obj, out AclInfo aclInfo, out AclEntry[] calculatedPermissions, out bool bIsOwner)
+        {
+            throw new NotImplementedException();
+        }
+
+        SEID IPlasticAPI.GetOwner(string server, ObjectInfo obj)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList<SecuredPathInfo> IPlasticAPI.GetSecuredPaths(string server, RepId repId, string path, string tag, LongArray brIds)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.SetPermissions(string server, ObjectInfo obj, SEID seid, Permissions granted, Permissions denied, Permissions overrideGranted, Permissions overrideDenied)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.RemovePermissions(string server, ObjectInfo obj, SEID seid)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList<SecuredPathInfo> IPlasticAPI.GetAllSecuredPaths(RepositorySpec repSpec)
+        {
+            throw new NotImplementedException();
+        }
+
+        IList<SecuredPathInfo> IPlasticAPI.GetSecuredPaths(RepositorySpec repSpec, string path)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.DownloadFileFromPath(List<ConfiguredPath> filePaths, WorkspaceInfo wkInfo, UpdateProgress updateProgress)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.SaveToken(string server, string user, string token)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IPlasticAPI.SaveProfile(
+            string server, SEIDWorkingMode workingMode, string user, string password)
+        {
+            throw new NotImplementedException();
+        }
+
+        BranchInfo mWorkingBranch;
+        Dictionary<string, WorkspaceTreeNode> mWorkspaceTreeNodes =
+            new Dictionary<string, WorkspaceTreeNode>();
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/Mock/PlasticApiMock.cs.meta b/Tests/Editor/PlasticSCM/Mock/PlasticApiMock.cs.meta
new file mode 100644
index 0000000..5f33d97
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Mock/PlasticApiMock.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1935a780ae95f5546bbd63924addef2f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/ProjectDownloader.meta b/Tests/Editor/PlasticSCM/ProjectDownloader.meta
new file mode 100644
index 0000000..104aaa2
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/ProjectDownloader.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec6f7d5f9f244c543aac278e57d1d0f5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/ProjectDownloader/CommandLineArgumentsTests.cs b/Tests/Editor/PlasticSCM/ProjectDownloader/CommandLineArgumentsTests.cs
new file mode 100644
index 0000000..4cdf6b8
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/ProjectDownloader/CommandLineArgumentsTests.cs
@@ -0,0 +1,240 @@
+using System.Collections.Generic;
+
+using NUnit.Framework;
+using Unity.PlasticSCM.Editor.ProjectDownloader;
+
+namespace Unity.PlasticSCM.Tests.Editor.ProjectDownloader
+{
+    [TestFixture]
+    public class CommandLineArgumentsTests
+    {
+        [Test]
+        public void TestNullArguments()
+        {
+            string[] args = null;
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(0, parsedArgs.Count);
+        }
+
+        [Test]
+        public void TestEmptyArguments()
+        {
+            string[] args = new string[]{ };
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(0, parsedArgs.Count);
+        }
+
+        [Test]
+        public void TestProgramArgumentOnly()
+        {
+            string[] args = new string[]
+            {
+                @"C:\Program Files\Unity\Hub\Editor\2018.4.25f1\Editor\unity.exe"
+            };
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(0, parsedArgs.Count);
+        }
+
+        [Test]
+        public void TestSingleArgument()
+        {
+            string useHub = "-useHub";
+
+            string[] args = new string[]
+            {
+                @"C:\Program Files\Unity\Hub\Editor\2018.4.25f1\Editor\unity.exe",
+                useHub
+            };
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(1, parsedArgs.Count);
+            Assert.IsTrue(parsedArgs.ContainsKey(useHub));
+            Assert.IsNull(parsedArgs[useHub]);
+        }
+
+        [Test]
+        public void TestKeyValueArgument()
+        {
+            string createProjectKey = "-createProject";
+            string createProjectValue = @"c:\tmp\newproj";
+
+            string[] args = new string[]
+            {
+                @"C:\Program Files\Unity\Hub\Editor\2018.4.25f1\Editor\unity.exe",
+                createProjectKey,
+                createProjectValue  };
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(1, parsedArgs.Count);
+            Assert.IsTrue(parsedArgs.ContainsKey(createProjectKey));
+            Assert.AreEqual(createProjectValue, parsedArgs[createProjectKey]);
+        }
+
+        [Test]
+        public void TestConsecutiveSingleArguments()
+        {
+            string useHub = "-useHub";
+            string useIPC = "-useIPC";
+
+            string[] args = new string[]
+            {
+                @"C:\Program Files\Unity\Hub\Editor\2018.4.25f1\Editor\unity.exe",
+                useHub,
+                useIPC
+            };
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(2, parsedArgs.Count);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(useHub));
+            Assert.IsNull(parsedArgs[useHub]);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(useIPC));
+            Assert.IsNull(parsedArgs[useIPC]);
+        }
+
+        [Test]
+        public void TestConsecutiveKeyValueArguments()
+        {
+            string createProjectKey = "-createProject";
+            string createProjectValue = @"c:\tmp\newproj";
+
+            string cloudEnvironmentKey = "-cloudEnvironment";
+            string cloudEnvironmentValue = "production";
+
+            string[] args = new string[] {
+                @"C:\Program Files\Unity\Hub\Editor\2018.4.25f1\Editor\unity.exe",
+                createProjectKey,
+                createProjectValue,
+                cloudEnvironmentKey,
+                cloudEnvironmentValue
+            };
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(2, parsedArgs.Count);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(createProjectKey));
+            Assert.AreEqual(createProjectValue, parsedArgs[createProjectKey]);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(cloudEnvironmentKey));
+            Assert.AreEqual(cloudEnvironmentValue, parsedArgs[cloudEnvironmentKey]);
+        }
+
+        [Test]
+        public void TestArgumentsAreTrimmed()
+        {
+            string useHub = "    -useHub    ";
+            string useHubTrimmed = "-useHub";
+
+            string[] args = new string[] {
+                @"C:\Program Files\Unity\Hub\Editor\2018.4.25f1\Editor\unity.exe",
+                useHub
+            };
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(1, parsedArgs.Count);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(useHubTrimmed));
+            Assert.IsNull(parsedArgs[useHubTrimmed]);
+        }
+
+        [Test]
+        public void TestDuplicatedArguments()
+        {
+            // we found cases (sign out/sign in/close unity/open project from the hub)
+            // in which the hub passes duplicated arguments
+
+            string projectPathKey = "-projectPath";
+            string projectPathValue = @"c:\tmp\newproj";
+
+            string[] args = new string[] {
+                @"C:\Program Files\Unity\Hub\Editor\Unity 2020.2.1f1\Editor\unity.exe",
+                projectPathKey,
+                projectPathValue,
+                projectPathKey,
+                projectPathValue
+            };
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(1, parsedArgs.Count);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(projectPathKey));
+            Assert.AreEqual(projectPathValue, parsedArgs[projectPathKey]);
+        }
+
+        [Test]
+        public void TestRealExample()
+        {
+            string createProjectKey = "-createProject";
+            string createProjectValue = @"c:\tmp\newproj";
+
+            string useHub = "-useHub";
+            string useIPC = "-useIPC";
+
+            string cloudEnvironmentKey = "-cloudEnvironment";
+            string cloudEnvironmentValue = "production";
+
+            string cloudProjectKey = "-cloudProject";
+            string cloudProjectValue = "fpsmicrogame";
+
+            string cloudOrganizationKey = "- cloudOrganization";
+            string cloudOrganizationValue = "D51E18A1-CA04-4E7C-A649-6FD2829E3223-danipen-unity";
+
+            string accessTokenKey = "-accessToken";
+            string accessTokenValue = "5k-CzPsncn9bGLI_uSZ91EhJW44Dcj1ShQPtKjCp2rA005f";
+
+            string[] args = new string[] {
+                @"C:\Program Files\Unity\Hub\Editor\2018.4.25f1\Editor\unity.exe",
+                createProjectKey,
+                createProjectValue,
+                useHub,
+                useIPC,
+                cloudEnvironmentKey,
+                cloudEnvironmentValue,
+                cloudProjectKey,
+                cloudProjectValue,
+                cloudOrganizationKey,
+                cloudOrganizationValue,
+                accessTokenKey,
+                accessTokenValue
+            };
+
+            Dictionary<string, string> parsedArgs = CommandLineArguments.Build(args);
+
+            Assert.AreEqual(7, parsedArgs.Count);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(createProjectKey));
+            Assert.AreEqual(createProjectValue, parsedArgs[createProjectKey]);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(useHub));
+            Assert.IsNull(parsedArgs[useHub]);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(useIPC));
+            Assert.IsNull(parsedArgs[useIPC]);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(cloudEnvironmentKey));
+            Assert.AreEqual(cloudEnvironmentValue, parsedArgs[cloudEnvironmentKey]);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(cloudProjectKey));
+            Assert.AreEqual(cloudProjectValue, parsedArgs[cloudProjectKey]);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(cloudOrganizationKey));
+            Assert.AreEqual(cloudOrganizationValue, parsedArgs[cloudOrganizationKey]);
+
+            Assert.IsTrue(parsedArgs.ContainsKey(accessTokenKey));
+            Assert.AreEqual(accessTokenValue, parsedArgs[accessTokenKey]);
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/ProjectDownloader/CommandLineArgumentsTests.cs.meta b/Tests/Editor/PlasticSCM/ProjectDownloader/CommandLineArgumentsTests.cs.meta
new file mode 100644
index 0000000..56d79e8
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/ProjectDownloader/CommandLineArgumentsTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 296e1c49ec5330a4d9a73a4139e24bef
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/ProjectDownloader/ParseArgumentsTest.cs b/Tests/Editor/PlasticSCM/ProjectDownloader/ParseArgumentsTest.cs
new file mode 100644
index 0000000..9e2b3a3
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/ProjectDownloader/ParseArgumentsTest.cs
@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using System.Collections.Generic;
+using Unity.PlasticSCM.Editor.ProjectDownloader;
+
+namespace Unity.PlasticSCM.Tests.Editor.ProjectDownloader
+{
+    [TestFixture]
+    class ParseArgumentsTest
+    {
+        [Test]
+        public void TestParseCloudProject()
+        {
+            Dictionary<string, string> args = new Dictionary<string, string>();
+
+            args.Add("-cloudProject", "fpsmicrogame");
+
+            Assert.AreEqual("fpsmicrogame", ParseArguments.CloudProject(args));
+        }
+
+        [Test]
+        public void TestParseCloudOrganization()
+        {
+            Dictionary<string, string> args = new Dictionary<string, string>();
+
+            args.Add("-cloudOrganization", "D51E18A1-CA04-4E7C-A649-6FD2829E3223-danipen-unity");
+
+            Assert.AreEqual("danipen-unity", ParseArguments.CloudOrganization(args));
+        }
+
+        [Test]
+        public void TestParseProjectPath()
+        {
+            Dictionary<string, string> args = new Dictionary<string, string>();
+
+            args.Add("-createProject", @"c:\tmp\newproj");
+
+            Assert.AreEqual(@"c:\tmp\newproj", ParseArguments.ProjectPath(args));
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/ProjectDownloader/ParseArgumentsTest.cs.meta b/Tests/Editor/PlasticSCM/ProjectDownloader/ParseArgumentsTest.cs.meta
new file mode 100644
index 0000000..d130f27
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/ProjectDownloader/ParseArgumentsTest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4f91902dd112b67448af5d5aced09a31
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/UI.meta b/Tests/Editor/PlasticSCM/UI.meta
new file mode 100644
index 0000000..61dcd90
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fb5a6f68c67a1e24bbe9c8cff934bab2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/UI/EditorVersionTests.cs b/Tests/Editor/PlasticSCM/UI/EditorVersionTests.cs
new file mode 100644
index 0000000..7053990
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/UI/EditorVersionTests.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Tests.Editor.UI
+{
+    [TestFixture]
+    internal class EditorVersionTests
+    {
+        [Test]
+        public void EditorVersionTests_Equals()
+        {
+            Assert.False(EditorVersion.IsEditorOlderThan("2019.1.10f1", "2019.1.10f1"));
+        }
+
+        [Test]
+        public void EditorVersionTests_Newer()
+        {
+            Assert.False(EditorVersion.IsEditorOlderThan("2019.2.10f1", "2018.100.100f1"));
+            Assert.False(EditorVersion.IsEditorOlderThan("2019.2.10f1", "2019.1.100f1"));
+            Assert.False(EditorVersion.IsEditorOlderThan("2019.2.10f1", "2019.2.1f1"));
+        }
+
+        [Test]
+        public void EditorVersionTests_Older()
+        {
+            Assert.True(EditorVersion.IsEditorOlderThan("2019.2.10f1", "2020.1.1f1"));
+            Assert.True(EditorVersion.IsEditorOlderThan("2019.2.10f1", "2019.3.1f1"));
+            Assert.True(EditorVersion.IsEditorOlderThan("2019.2.10f1", "2019.2.11f1"));
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/UI/EditorVersionTests.cs.meta b/Tests/Editor/PlasticSCM/UI/EditorVersionTests.cs.meta
new file mode 100644
index 0000000..8581f12
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/UI/EditorVersionTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 807bcb4611aec064eacc4bd9e73933da
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/UI/TextureLoadTests.cs b/Tests/Editor/PlasticSCM/UI/TextureLoadTests.cs
new file mode 100644
index 0000000..6968e5a
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/UI/TextureLoadTests.cs
@@ -0,0 +1,42 @@
+using NUnit.Framework;
+
+using UnityEngine;
+using UnityEngine.Profiling;
+
+using Unity.PlasticSCM.Editor.UI;
+
+namespace Unity.PlasticSCM.Tests.Editor.UI
+{
+    [TestFixture]
+    internal class TextureLoadTests
+    {
+        // NOTE(rafa): thes are no real test just use cases to verify in the profiler what happens when load more than once the same texture.
+
+        [Test]
+        public void OneLoad_Reference()
+        {
+            Profiler.BeginSample("TextureLoadTest - One load");
+
+            var icon = Images.GetImage(Images.Name.IconPlastic);
+
+            Profiler.EndSample();
+
+            Assert.NotNull(icon);
+        }
+
+        [Test]
+        public void OneHundredLoads_Reference()
+        {
+            var icons = new Texture[100];
+
+            Profiler.BeginSample("TextureLoadTest - One hundred loads");
+
+            for (int i = 0; i < 100; i++)
+                icons[i] = Images.GetImage(Images.Name.IconPlastic);
+
+            Profiler.EndSample();
+
+            CollectionAssert.AllItemsAreNotNull(icons);
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/UI/TextureLoadTests.cs.meta b/Tests/Editor/PlasticSCM/UI/TextureLoadTests.cs.meta
new file mode 100644
index 0000000..c0da76e
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/UI/TextureLoadTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 489c623a5d9c1374292110798e7ae5b9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Unity.PlasticSCM.EditorTests.asmdef b/Tests/Editor/PlasticSCM/Unity.PlasticSCM.EditorTests.asmdef
new file mode 100644
index 0000000..b9cadd1
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Unity.PlasticSCM.EditorTests.asmdef
@@ -0,0 +1,20 @@
+{
+    "name": "Unity.PlasticSCM.EditorTests",
+    "references": [
+        "Unity.PlasticSCM.Editor"
+    ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [
+        "unityplastic.dll"
+    ],
+    "autoReferenced": true,
+    "defineConstraints": []
+}
\ No newline at end of file
diff --git a/Tests/Editor/PlasticSCM/Unity.PlasticSCM.EditorTests.asmdef.meta b/Tests/Editor/PlasticSCM/Unity.PlasticSCM.EditorTests.asmdef.meta
new file mode 100644
index 0000000..fe75a9f
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Unity.PlasticSCM.EditorTests.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d2a21ff323ae84455892cb5f59624640
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views.meta b/Tests/Editor/PlasticSCM/Views.meta
new file mode 100644
index 0000000..50ea3ca
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5052aa3fb5eaae24e930bd25590f4717
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/Diff.meta b/Tests/Editor/PlasticSCM/Views/Diff.meta
new file mode 100644
index 0000000..73cf84f
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/Diff.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b94ece2bdeba6a6429e969601ed1928a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/Diff/UnityDiffTreeTests.cs b/Tests/Editor/PlasticSCM/Views/Diff/UnityDiffTreeTests.cs
new file mode 100644
index 0000000..9d2d297
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/Diff/UnityDiffTreeTests.cs
@@ -0,0 +1,597 @@
+using System.Collections.Generic;
+
+using NUnit.Framework;
+
+using Codice.Client.Commands;
+using Codice.Client.Commands.Mount;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using Codice.Utils;
+using PlasticGui.WorkspaceWindow.Diff;
+using Unity.PlasticSCM.Editor.Views.Diff;
+
+namespace Unity.PlasticSCM.Tests.Editor.Views.Diff
+{
+    [TestFixture]
+    class UnityDiffTreeTests
+    {
+        [Test]
+        public void TestAddedNoMeta()
+        {
+            ClientDiff added = Build.Added("/foo/bar.c");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(added);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                added,
+                ChangeCategoryType.Added,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Added not found");
+
+            Assert.IsFalse(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta exists");
+        }
+
+        [Test]
+        public void TestChangedNoMeta()
+        {
+            ClientDiff changed = Build.Changed("/foo/bar.c");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(changed);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                changed,
+                ChangeCategoryType.Changed,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Changed not found");
+
+            Assert.IsFalse(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta exists");
+        }
+
+        [Test]
+        public void TestDeletedNoMeta()
+        {
+            ClientDiff deleted = Build.Deleted("/foo/bar.c");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(deleted);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                deleted,
+                ChangeCategoryType.Deleted,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Deleted not found");
+
+            Assert.IsFalse(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta exists");
+        }
+
+        [Test]
+        public void TestMovedNoMeta()
+        {
+            ClientDiff moved = Build.Moved("/foo/bar.src.c", "/foo/bar.c");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(moved);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                moved,
+                ChangeCategoryType.Moved,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Moved not found");
+
+            Assert.IsFalse(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta exists");
+        }
+
+        [Test]
+        public void TestFsPermissionsNoMeta()
+        {
+            ClientDiff changedFsPermissions = Build.ChangedFsPermissions("/foo/bar.c");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(changedFsPermissions);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                changedFsPermissions,
+                ChangeCategoryType.FSProtection,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Changed fs protection not found");
+
+            Assert.IsFalse(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta exists");
+        }
+
+        [Test]
+        public void TestMergedNoMeta()
+        {
+            ClientDiff merged = Build.Merged("/foo/bar.c");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(merged);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                merged,
+                ChangeCategoryType.Merged,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Merged not found");
+
+            Assert.IsFalse(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta exists");
+        }
+
+        [Test]
+        public void TestAddedWithMeta()
+        {
+            ClientDiff added = Build.Added("/foo/bar.c");
+            ClientDiff addedMeta = Build.Added("/foo/bar.c.meta");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(added);
+            diffs.Add(addedMeta);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                added,
+                ChangeCategoryType.Added,
+                diffTree);
+
+            ClientDiffInfo clientDiffInfoMeta = FindClientDiffInfo.FromClientDiff(
+                addedMeta,
+                ChangeCategoryType.Added,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Added not found");
+
+            Assert.IsNull(
+                clientDiffInfoMeta,
+                "Added meta found");
+
+            Assert.IsTrue(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta does not exist");
+        }
+
+        [Test]
+        public void TestChangedWithMeta()
+        {
+            ClientDiff changed = Build.Changed("/foo/bar.c");
+            ClientDiff changedMeta = Build.Changed("/foo/bar.c.meta");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(changed);
+            diffs.Add(changedMeta);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                changed,
+                ChangeCategoryType.Changed,
+                diffTree);
+
+            ClientDiffInfo clientDiffInfoMeta = FindClientDiffInfo.FromClientDiff(
+                changedMeta,
+                ChangeCategoryType.Changed,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Changed not found");
+
+            Assert.IsNull(
+                clientDiffInfoMeta,
+                "Changed meta found");
+
+            Assert.IsTrue(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta does not exist");
+        }
+
+        [Test]
+        public void TestDeletedWithMeta()
+        {
+            ClientDiff deleted = Build.Deleted("/foo/bar.c");
+            ClientDiff deletedMeta = Build.Deleted("/foo/bar.c.meta");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(deleted);
+            diffs.Add(deletedMeta);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                deleted,
+                ChangeCategoryType.Deleted,
+                diffTree);
+
+            ClientDiffInfo clientDiffInfoMeta = FindClientDiffInfo.FromClientDiff(
+                deletedMeta,
+                ChangeCategoryType.Deleted,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Deleted not found");
+
+            Assert.IsNull(
+                clientDiffInfoMeta,
+                "Deleted meta found");
+
+            Assert.IsTrue(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta does not exist");
+        }
+
+        [Test]
+        public void TestMovedWithMeta()
+        {
+            ClientDiff moved = Build.Moved("/foo/bar.src.c", "/foo/bar.c");
+            ClientDiff movedMeta = Build.Moved("/foo/bar.src.c.meta", "/foo/bar.c.meta");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(moved);
+            diffs.Add(movedMeta);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                moved,
+                ChangeCategoryType.Moved,
+                diffTree);
+
+            ClientDiffInfo clientDiffInfoMeta = FindClientDiffInfo.FromClientDiff(
+                movedMeta,
+                ChangeCategoryType.Moved,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Moved not found");
+
+            Assert.IsNull(
+                clientDiffInfoMeta,
+                "Moved meta found");
+
+            Assert.IsTrue(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta does not exist");
+        }
+
+        [Test]
+        public void TestFsPermissionsWithMeta()
+        {
+            ClientDiff fsPermissionsChange = Build.ChangedFsPermissions("/foo/bar.c");
+            ClientDiff fsPermissionsChangeMeta = Build.ChangedFsPermissions("/foo/bar.c.meta");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(fsPermissionsChange);
+            diffs.Add(fsPermissionsChangeMeta);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                fsPermissionsChange,
+                ChangeCategoryType.FSProtection,
+                diffTree);
+
+            ClientDiffInfo clientDiffInfoMeta = FindClientDiffInfo.FromClientDiff(
+                fsPermissionsChangeMeta,
+                ChangeCategoryType.FSProtection,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Change fs permissions not found");
+
+            Assert.IsNull(
+                clientDiffInfoMeta,
+                "Change fs permissions meta found");
+
+            Assert.IsTrue(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta does not exist");
+        }
+
+        [Test]
+        public void TestMergedWithMeta()
+        {
+            ClientDiff merged = Build.Merged("/foo/bar.c");
+            ClientDiff mergedMeta = Build.Merged("/foo/bar.c.meta");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(merged);
+            diffs.Add(mergedMeta);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                merged,
+                ChangeCategoryType.Merged,
+                diffTree);
+
+            ClientDiffInfo clientDiffInfoMeta = FindClientDiffInfo.FromClientDiff(
+                mergedMeta,
+                ChangeCategoryType.Merged,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Merged not found");
+
+            Assert.IsNull(
+                clientDiffInfoMeta,
+                "Merged meta found");
+
+            Assert.IsTrue(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta does not exist");
+        }
+
+        [Test]
+        public void TestChangeWithDeletedMeta()
+        {
+            ClientDiff changed = Build.Changed("/foo/bar.c");
+            ClientDiff deletedMeta = Build.Deleted("/foo/bar.c.meta");
+
+            List<ClientDiff> diffs = new List<ClientDiff>();
+            diffs.Add(changed);
+            diffs.Add(deletedMeta);
+
+            UnityDiffTree diffTree = new UnityDiffTree();
+            diffTree.BuildCategories(diffs, false);
+
+            ClientDiffInfo clientDiffInfo = FindClientDiffInfo.FromClientDiff(
+                changed,
+                ChangeCategoryType.Changed,
+                diffTree);
+
+            ClientDiffInfo clientDiffInfoMeta = FindClientDiffInfo.FromClientDiff(
+                deletedMeta,
+                ChangeCategoryType.Deleted,
+                diffTree);
+
+            Assert.IsNotNull(
+                clientDiffInfo,
+                "Changed not found");
+
+            Assert.IsNotNull(
+                clientDiffInfoMeta,
+                "Deleted meta not found");
+
+            Assert.IsFalse(
+                diffTree.HasMeta(clientDiffInfo),
+                "Meta exists");
+        }
+
+        static class Build
+        {
+            internal static ClientDiff Added(string path)
+            {
+                return new ClientDiff(
+                    BuildRootMountPoint(),
+                    BuildAddedDifference(path),
+                    null);
+            }
+
+
+            internal static ClientDiff Changed(string path)
+            {
+                return new ClientDiff(
+                    BuildRootMountPoint(),
+                    BuildChangedDifference(path),
+                    null);
+            }
+
+            internal static ClientDiff ChangedFsPermissions(string path)
+            {
+                return new ClientDiff(
+                    BuildRootMountPoint(),
+                    BuildChangedFsPermissionsDifference(path),
+                    null);
+            }
+
+            internal static ClientDiff Deleted(string path)
+            {
+                return new ClientDiff(
+                    BuildRootMountPoint(),
+                    BuildDeletedDifference(path),
+                    null);
+            }
+
+            internal static ClientDiff Merged(string path)
+            {
+                return new ClientDiff(
+                    BuildRootMountPoint(),
+                    BuildChangedDifference(path),
+                    new ItemDiffMerge(new List<RevisionMerge>()
+                    {
+                        new RevisionMerge()
+                        {
+                            SrcRevId = 15,
+                            DstRevId = 16,
+                            Link = new MergeLinkRealizationInfo(),
+                            Type = MergeChangeType.Merged
+                        }
+                    }));
+            }
+
+            internal static ClientDiff Moved(
+                string srcPath,
+                string dstPath)
+            {
+                return new ClientDiff(
+                    BuildRootMountPoint(),
+                    BuildMovedDifference(srcPath, dstPath),
+                    null);
+            }
+
+            static Difference BuildAddedDifference(string path)
+            {
+                return new DiffChanged(
+                    new RevisionInfo() { Type = EnumRevisionType.enTextFile },
+                    -1,
+                    path,
+                    -1,
+                    Difference.DiffNodeStatus.Added);
+            }
+
+            static Difference BuildChangedDifference(string path)
+            {
+                return new DiffChanged(
+                    new RevisionInfo() { Type = EnumRevisionType.enTextFile },
+                    -1,
+                    path,
+                    -1,
+                    Difference.DiffNodeStatus.Changed);
+            }
+
+            static Difference BuildChangedFsPermissionsDifference(string path)
+            {
+                return new DiffChanged(
+                    new RevisionInfo() { Type = EnumRevisionType.enTextFile },
+                    -1,
+                    path,
+                    -1,
+                    Difference.DiffNodeStatus.Changed,
+                    null,
+                    456);
+            }
+
+            static Difference BuildDeletedDifference(string path)
+            {
+                return new DiffChanged(
+                    new RevisionInfo() { Type = EnumRevisionType.enTextFile },
+                    -1,
+                    path,
+                    -1,
+                    Difference.DiffNodeStatus.Deleted);
+            }
+
+            static Difference BuildMovedDifference(string srcPath, string dstPath)
+            {
+                return new DiffMoved(
+                    new RevisionInfo() { Type = EnumRevisionType.enTextFile },
+                    -1,
+                    srcPath,
+                    -1,
+                    dstPath,
+                    -1);
+            }
+
+            static MountPointWithPath BuildRootMountPoint()
+            {
+                return new MountPointWithPath(
+                    MountPointId.WORKSPACE_ROOT,
+                    new RepositorySpec()
+                    {
+                        Name = "myrep",
+                        Server = "myserver:8084"
+                    },
+                    "/myroot");
+            }
+        }
+
+        static class FindClientDiffInfo
+        {
+            internal static ClientDiffInfo FromClientDiff(
+                ClientDiff clientDiff,
+                ChangeCategoryType type,
+                UnityDiffTree diffTree)
+            {
+                foreach (ITreeViewNode node in diffTree.GetNodes())
+                {
+                    ClientDiffInfo result = FindClientDiffOfType(
+                        clientDiff.Diff.Path,
+                        type,
+                        node);
+
+                    if (result != null)
+                        return result;
+                }
+
+                return null;
+            }
+
+            static ClientDiffInfo FindClientDiffOfType(
+                string path,
+                ChangeCategoryType type,
+                ITreeViewNode node)
+            {
+                if (node is ClientDiffInfo)
+                {
+                    ClientDiffInfo clientDiffInfo = (ClientDiffInfo)node;
+                    ChangeCategory category = (ChangeCategory)node.GetParent();
+
+                    if (category.Type == type &&
+                        clientDiffInfo.DiffWithMount.Difference.Path == path)
+                    {
+                        return (ClientDiffInfo)node;
+                    }
+                }
+
+                for (int i = 0; i < node.GetChildrenCount(); i++)
+                {
+                    ClientDiffInfo result = FindClientDiffOfType(path, type, node.GetChild(i));
+                    if (result != null)
+                        return result;
+                }
+
+                return null;
+            }
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/Views/Diff/UnityDiffTreeTests.cs.meta b/Tests/Editor/PlasticSCM/Views/Diff/UnityDiffTreeTests.cs.meta
new file mode 100644
index 0000000..f181b52
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/Diff/UnityDiffTreeTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: af45769ecaeccf943862f37957de94e2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges.meta b/Tests/Editor/PlasticSCM/Views/IncomingChanges.meta
new file mode 100644
index 0000000..dfb82ff
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0efcd28b6717b0a45a07c4c6670baa72
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer.meta b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer.meta
new file mode 100644
index 0000000..e9a9f1c
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2b100a3b9f5eeed469e6de85657bfe55
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrentTests.cs b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrentTests.cs
new file mode 100644
index 0000000..57c2438
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrentTests.cs
@@ -0,0 +1,154 @@
+using NUnit.Framework;
+
+using Codice.Client.BaseCommands.Merge;
+using Codice.Client.Commands;
+using Codice.Client.Commands.Mount;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+using Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer;
+
+namespace Unity.PlasticSCM.Tests.Editor.Views.IncomingChanges.Developer
+{
+    [TestFixture]
+    class IsCurrentTests
+    {
+        [Test]
+        public void NullValuesTest()
+        {
+            Assert.IsFalse(
+                IsCurrent.Conflict(null, null, null),
+                "Null values should return false");
+        }
+
+        [Test]
+        public void NotCurrentConflictTest()
+        {
+            long itemId = 55;
+            MountPointId mountPointId = MountPointId.WORKSPACE_ROOT;
+
+            IncomingChangeInfo changeInfo = BuildChangeInfo(mountPointId, itemId);
+            MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts();
+
+            Assert.IsFalse(
+                IsCurrent.Conflict(changeInfo, null, solvedFileConflicts),
+                "Should return false");
+        }
+
+        [Test]
+        public void CurrentConflictTest()
+        {
+            long itemId = 55;
+            MountPointId mountPointId = MountPointId.WORKSPACE_ROOT;
+
+            IncomingChangeInfo changeInfo = BuildChangeInfo(mountPointId, itemId);
+            MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts();
+
+            MergeSolvedFileConflicts.CurrentConflict currentConflict = new MergeSolvedFileConflicts.CurrentConflict(
+                mountPointId, itemId, 0);
+
+            solvedFileConflicts.SetCurrentConflict(currentConflict);
+
+            Assert.IsTrue(
+                IsCurrent.Conflict(changeInfo, null, solvedFileConflicts),
+                "Should return true");
+        }
+
+        [Test]
+        public void NotCurrentConflictWithMeta()
+        {
+            long itemId = 55;
+            long metaItemId = 66;
+
+            MountPointId mountPointId = MountPointId.WORKSPACE_ROOT;
+
+            IncomingChangeInfo changeInfo = BuildChangeInfo(mountPointId, itemId);
+            IncomingChangeInfo metaChangeInfo = BuildChangeInfo(mountPointId, metaItemId);
+
+            MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts();
+
+            Assert.IsFalse(
+                IsCurrent.Conflict(changeInfo, metaChangeInfo, solvedFileConflicts),
+                "Should return false");
+        }
+
+        [Test]
+        public void CurrentConflictWithMetaCurrentIsNotTheMeta()
+        {
+            long itemId = 55;
+            long metaItemId = 66;
+
+            MountPointId mountPointId = MountPointId.WORKSPACE_ROOT;
+
+            IncomingChangeInfo changeInfo = BuildChangeInfo(mountPointId, itemId);
+            IncomingChangeInfo metaChangeInfo = BuildChangeInfo(mountPointId, metaItemId);
+
+            MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts();
+
+            MergeSolvedFileConflicts.CurrentConflict currentConflict = new MergeSolvedFileConflicts.CurrentConflict(
+                mountPointId, itemId, 0);
+
+            solvedFileConflicts.SetCurrentConflict(currentConflict);
+
+            Assert.IsTrue(
+                IsCurrent.Conflict(changeInfo, metaChangeInfo, solvedFileConflicts),
+                "Should return true");
+        }
+
+        [Test]
+        public void CurrentConflictWithMetaCurrentIsTheMeta()
+        {
+            long itemId = 55;
+            long metaItemId = 66;
+
+            MountPointId mountPointId = MountPointId.WORKSPACE_ROOT;
+
+            IncomingChangeInfo changeInfo = BuildChangeInfo(mountPointId, itemId);
+            IncomingChangeInfo metaChangeInfo = BuildChangeInfo(mountPointId, metaItemId);
+
+            MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts();
+
+            MergeSolvedFileConflicts.CurrentConflict currentConflict = new MergeSolvedFileConflicts.CurrentConflict(
+                mountPointId, metaItemId, 0);
+
+            solvedFileConflicts.SetCurrentConflict(currentConflict);
+
+            Assert.IsTrue(
+                IsCurrent.Conflict(changeInfo, metaChangeInfo, solvedFileConflicts),
+                "Should return true");
+        }
+
+        IncomingChangeInfo BuildChangeInfo(MountPointId mountId, long itemId)
+        {
+            return new IncomingChangeInfo(
+                new MountPointWithPath(
+                    mountId,
+                    new RepositorySpec(),
+                    "/"),
+                BuildFileConflict(itemId),
+                IncomingChangesCategory.Type.FileConflicts);
+        }
+
+        FileConflict BuildFileConflict(long itemId)
+        {
+            DiffChanged src = new DiffChanged(
+                CreateFileRevision(itemId), -1, "foo.c", -1,
+                Difference.DiffNodeStatus.Changed);
+
+            DiffChanged dst = new DiffChanged(
+                CreateFileRevision(itemId), -1, "foo.c", -1,
+                Difference.DiffNodeStatus.Changed);
+
+            return new FileConflict(src, dst);
+        }
+
+        static RevisionInfo CreateFileRevision(long itemId)
+        {
+            RevisionInfo result = new RevisionInfo();
+            result.Type = EnumRevisionType.enTextFile;
+            result.Size = 128;
+            result.ItemId = itemId;
+            return result;
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrentTests.cs.meta b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrentTests.cs.meta
new file mode 100644
index 0000000..b9c679a
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsCurrentTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b7a11ad228943e2429861a6695633bae
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolvedTests.cs b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolvedTests.cs
new file mode 100644
index 0000000..58e6505
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolvedTests.cs
@@ -0,0 +1,183 @@
+using NUnit.Framework;
+
+using Codice.Client.BaseCommands.Merge;
+using Codice.Client.Commands;
+using Codice.Client.Commands.Mount;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+using Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer;
+
+namespace Unity.PlasticSCM.Tests.Editor.Views.IncomingChanges.Developer
+{
+    [TestFixture]
+    class IsResolvedTests
+    {
+        [Test]
+        public void IsDirectoryConflictResolved()
+        {
+            IncomingChangeInfo dirConflict = BuilDirectoryConflict(true, 55);
+
+            Assert.IsTrue(
+                IsSolved.Conflict(dirConflict, null, null),
+                "Conflict should be resolved");
+        }
+
+        [Test]
+        public void IsDirectoryConflictNotResolved()
+        {
+            IncomingChangeInfo dirConflict = BuilDirectoryConflict(false, 55);
+
+            Assert.IsFalse(
+                IsSolved.Conflict(dirConflict, null, null),
+                "Conflict shouldn't be resolved");
+        }
+
+
+        [Test]
+        public void IsFileConflictResolved()
+        {
+            long itemId = 55;
+            MountPointId mountPointId = MountPointId.WORKSPACE_ROOT;
+
+            IncomingChangeInfo fileConflict = BuildFileConflict(mountPointId, itemId);
+
+            MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts();
+            solvedFileConflicts.AddResolveFile(mountPointId, itemId, "foo.c");
+
+            Assert.IsTrue(
+                IsSolved.Conflict(fileConflict, null, solvedFileConflicts),
+                "Conflict should be resolved");
+        }
+
+        [Test]
+        public void IsFileConflictNotResolved()
+        {
+            long itemId = 55;
+            MountPointId mountPointId = MountPointId.WORKSPACE_ROOT;
+
+            IncomingChangeInfo fileConflict = BuildFileConflict(mountPointId, itemId);
+
+            MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts();
+
+            Assert.IsFalse(
+                IsSolved.Conflict(fileConflict, null, solvedFileConflicts),
+                "Conflict shouldn't be resolved");
+        }
+
+        [Test]
+        public void IsDirectoryConflictWithMetaResolved()
+        {
+            IncomingChangeInfo dirConflict = BuilDirectoryConflict(true, 55);
+            IncomingChangeInfo metaDirConflict = BuilDirectoryConflict(true, 55);
+
+            Assert.IsTrue(
+                IsSolved.Conflict(dirConflict, metaDirConflict, null),
+                "Conflict should be resolved");
+        }
+
+        [Test]
+        public void IsDirectoryConflictWithMetaNotResolved()
+        {
+            IncomingChangeInfo dirConflict = BuilDirectoryConflict(true, 55);
+            IncomingChangeInfo metaDirConflict = BuilDirectoryConflict(false, 66);
+
+            Assert.IsFalse(
+                IsSolved.Conflict(dirConflict, metaDirConflict, null),
+                "Conflict shouldn't be resolved");
+        }
+
+        [Test]
+        public void IsFileConflictWithMetaResolved()
+        {
+            long itemId = 55;
+            long metaItemId = 66;
+
+            MountPointId mountPointId = MountPointId.WORKSPACE_ROOT;
+
+            IncomingChangeInfo fileConflict = BuildFileConflict(mountPointId, itemId);
+            IncomingChangeInfo metaFileConflict = BuildFileConflict(mountPointId, metaItemId);
+
+            MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts();
+            solvedFileConflicts.AddResolveFile(mountPointId, itemId, "foo.c");
+            solvedFileConflicts.AddResolveFile(mountPointId, metaItemId, "foo.c.meta");
+
+            Assert.IsTrue(
+                IsSolved.Conflict(fileConflict, metaFileConflict, solvedFileConflicts),
+                "Conflict should be resolved");
+        }
+
+        [Test]
+        public void IsFileDirectoryConflictWithMetaNotResolved()
+        {
+            long itemId = 55;
+            long metaItemId = 66;
+
+            MountPointId mountPointId = MountPointId.WORKSPACE_ROOT;
+
+            IncomingChangeInfo fileConflict = BuildFileConflict(mountPointId, itemId);
+            IncomingChangeInfo metaFileConflict = BuildFileConflict(mountPointId, metaItemId);
+
+            MergeSolvedFileConflicts solvedFileConflicts = new MergeSolvedFileConflicts();
+            solvedFileConflicts.AddResolveFile(mountPointId, itemId, "foo.c");
+
+            Assert.IsFalse(
+                IsSolved.Conflict(fileConflict, metaFileConflict, solvedFileConflicts),
+                "Conflict shouldn't be resolved");
+        }
+
+        IncomingChangeInfo BuilDirectoryConflict(bool isResolved, long itemId)
+        {
+            DiffChanged src = new DiffChanged(
+                CreateFileRevision(itemId), -1, "foo.c", -1,
+                Difference.DiffNodeStatus.Added);
+
+            DiffChanged dst = new DiffChanged(
+                CreateFileRevision(itemId), -1, "foo.c", -1,
+                Difference.DiffNodeStatus.Added);
+
+            DirectoryConflict dirConflict = new EvilTwinConflict(src, dst);
+            dirConflict.SetIsResolved(isResolved);
+
+            IncomingChangeInfo result = new IncomingChangeInfo(
+                new MountPointWithPath(
+                    MountPointId.WORKSPACE_ROOT,
+                    new RepositorySpec(),
+                    "/"),
+                dirConflict,
+                null,
+                null,
+                IncomingChangesCategory.Type.DirectoryConflicts);
+
+            return result;
+        }
+
+        IncomingChangeInfo BuildFileConflict(MountPointId mountPointId, long itemId)
+        {
+            DiffChanged src = new DiffChanged(
+                CreateFileRevision(itemId), -1, "foo.c", -1,
+                Difference.DiffNodeStatus.Changed);
+
+            DiffChanged dst = new DiffChanged(
+                CreateFileRevision(itemId), -1, "foo.c", -1,
+                Difference.DiffNodeStatus.Changed);
+
+            return new IncomingChangeInfo(
+                new MountPointWithPath(
+                    mountPointId,
+                    new RepositorySpec(),
+                    "/"),
+                new FileConflict(src, dst),
+                IncomingChangesCategory.Type.FileConflicts);
+        }
+
+        static RevisionInfo CreateFileRevision(long itemId)
+        {
+            RevisionInfo result = new RevisionInfo();
+            result.Type = EnumRevisionType.enTextFile;
+            result.Size = 128;
+            result.ItemId = itemId;
+            return result;
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolvedTests.cs.meta b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolvedTests.cs.meta
new file mode 100644
index 0000000..d105319
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/IsResolvedTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2debcda65933d1d44b61c4435e4a13ba
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/MergetTreeResultMock.cs b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/MergetTreeResultMock.cs
new file mode 100644
index 0000000..c8ccc6d
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/MergetTreeResultMock.cs
@@ -0,0 +1,209 @@
+using System;
+
+using Codice.Client.Commands.Merge;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using Codice.CM.Common.Tree;
+
+namespace Unity.PlasticSCM.Tests.Editor.Views.IncomingChanges.Developer
+{
+    internal static class MergeTreeResultMock
+    {
+        internal static MergeTreeResult Build0()
+        {
+            MergeTreeResult mergeTreeResult = new MergeTreeResult();
+
+            mergeTreeResult.AddsToApply.Add(CreateDirectoryAddedDifference());
+            mergeTreeResult.AddsToApply.Add(CreateFileAddedDifference(1024));
+            mergeTreeResult.AddsToApply.Add(CreateFileAddedDifference(512));
+
+            mergeTreeResult.MovesToApply.Add(CreateMovedDifference());
+            mergeTreeResult.MovesToApply.Add(CreateMovedDifference());
+
+            mergeTreeResult.DeletesToApply.Add(CreateDeletedDifference());
+
+            mergeTreeResult.FilesModifiedOnSource.Add(CreateModifiedDifference(312));
+            mergeTreeResult.FilesModifiedOnSource.Add(CreateModifiedDifference(10));
+
+            return mergeTreeResult;
+        }
+
+        internal static MergeTreeResult Build1()
+        {
+            MergeTreeResult mergeTreeResult = new MergeTreeResult();
+            MergeTreeResult firstLevelXlinkMergeTreeResult = new MergeTreeResult();
+            MergeTreeResult secondLevelXlinkMergeTreeResult = new MergeTreeResult();
+
+            ClientWritableXlinkConflict firstLevelXlinkConflict = CreateWritableXlinkConflict();
+            firstLevelXlinkConflict.XlinkMergeResult = new MergeResult();
+            firstLevelXlinkConflict.XlinkMergeResult.ResultConflicts = firstLevelXlinkMergeTreeResult;
+
+            ClientWritableXlinkConflict secondLevelXlinkConflict = CreateWritableXlinkConflict();
+            secondLevelXlinkConflict.XlinkMergeResult = new MergeResult();
+            secondLevelXlinkConflict.XlinkMergeResult.ResultConflicts = secondLevelXlinkMergeTreeResult;
+
+            secondLevelXlinkMergeTreeResult.AddsToApply.Add(CreateFileAddedDifference(10));
+            secondLevelXlinkMergeTreeResult.FilesModifiedOnSource.Add(CreateModifiedDifference(20));
+
+            firstLevelXlinkMergeTreeResult.WritableXlinkConflicts.Add(secondLevelXlinkConflict);
+            firstLevelXlinkMergeTreeResult.AddsToApply.Add(CreateFileAddedDifference(512));
+            firstLevelXlinkMergeTreeResult.DeletesToApply.Add(CreateDeletedDifference());
+
+            mergeTreeResult.WritableXlinkConflicts.Add(firstLevelXlinkConflict);
+            mergeTreeResult.AddsToApply.Add(CreateFileAddedDifference(1024));
+            return mergeTreeResult;
+        }
+
+        internal static MergeTreeResult Build2()
+        {
+            MergeTreeResult mergeTreeResult = new MergeTreeResult();
+
+            mergeTreeResult.FileConflicts.Add(CreateFileConflict(312));
+            mergeTreeResult.FileConflicts.Add(CreateFileConflict(318));
+            mergeTreeResult.FileConflicts.Add(CreateFileConflict(398));
+
+            mergeTreeResult.AddsToApply.Add(CreateDirectoryAddedDifference());
+            mergeTreeResult.AddsToApply.Add(CreateFileAddedDifference(1024));
+            mergeTreeResult.AddsToApply.Add(CreateFileAddedDifference(512));
+
+            mergeTreeResult.MovesToApply.Add(CreateMovedDifference());
+            mergeTreeResult.MovesToApply.Add(CreateMovedDifference());
+
+            mergeTreeResult.DeletesToApply.Add(CreateDeletedDifference());
+
+            mergeTreeResult.FilesModifiedOnSource.Add(CreateModifiedDifference(312));
+            mergeTreeResult.FilesModifiedOnSource.Add(CreateModifiedDifference(10));
+
+            return mergeTreeResult;
+        }
+
+        static Difference CreateDirectoryAddedDifference()
+        {
+            return new DiffChanged(
+                CreateDirectoryRevision(), -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Added);
+        }
+
+        static Difference CreateFileAddedDifference(long size)
+        {
+            return new DiffChanged(
+                CreateFileRevision(size), -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Added);
+        }
+
+        static Difference CreateMovedDifference()
+        {
+            return new DiffMoved(
+                new RevisionInfo(), -1, CreateRandomPath(), -1,
+                CreateRandomPath(), -1);
+        }
+
+        static Difference CreateDeletedDifference()
+        {
+            return new DiffChanged(
+                new RevisionInfo() { Type = EnumRevisionType.enTextFile }, -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Deleted);
+        }
+
+        static FileConflict CreateModifiedDifference(long size)
+        {
+            DiffChanged src = new DiffChanged(
+                CreateFileRevision(size), -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Changed);
+
+            return new FileConflict(src, null);
+        }
+
+        static FileConflict CreateFileConflict(long size)
+        {
+            DiffChanged src = new DiffChanged(
+                CreateFileRevision(size), -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Changed);
+
+            DiffChanged dst = new DiffChanged(
+                CreateFileRevision(size), -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Changed);
+
+            return new FileConflict(src, dst);
+        }
+
+        static DiffXlinkChanged CreateAddedDiffXlinkChanged()
+        {
+            return new DiffXlinkChanged(
+                new Xlink(), -1, "/", -1, Difference.DiffNodeStatus.Added);
+        }
+
+        static FileConflict CreateModifiedDiffXlinkChanged()
+        {
+            DiffXlinkChanged src = new DiffXlinkChanged(
+                new Xlink(), -1, "/", -1, Difference.DiffNodeStatus.Changed);
+
+            return new FileConflict(src, null);
+        }
+
+        static ChangeDeleteConflict CreateChangeDeleteConflict(
+            long changeSize, long deleteSize, bool isChangeDelete)
+        {
+            DiffChanged src = new DiffChanged(
+                CreateFileRevision(changeSize), -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Changed);
+
+            DiffChanged dst = new DiffChanged(
+                CreateFileRevision(deleteSize), -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Deleted);
+
+            if (isChangeDelete)
+                return new ChangeDeleteConflict(src, dst);
+
+            return new ChangeDeleteConflict(dst, src);
+        }
+
+        static EvilTwinConflict CreateEvilTwinConflict(int addedSize)
+        {
+            DiffChanged src = new DiffChanged(
+                CreateFileRevision(addedSize), -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Added);
+
+            DiffChanged dst = new DiffChanged(
+                CreateFileRevision(addedSize), -1, CreateRandomPath(), -1,
+                Difference.DiffNodeStatus.Added);
+
+            return new EvilTwinConflict(src, dst);
+        }
+
+        static ClientWritableXlinkConflict CreateWritableXlinkConflict()
+        {
+            Xlink baseXlink = new Xlink();
+            Xlink srcXlink = new Xlink();
+            Xlink dstXlink = new Xlink();
+
+            DiffXlinkChanged src = new DiffXlinkChanged(
+                srcXlink, -1, "/", -1, Difference.DiffNodeStatus.Changed);
+            src.BaseXlink = baseXlink;
+            DiffXlinkChanged dst = new DiffXlinkChanged(
+                dstXlink, -1, "/", -1, Difference.DiffNodeStatus.Changed);
+
+            return new ClientWritableXlinkConflict(src, dst);
+        }
+
+        static RevisionInfo CreateDirectoryRevision()
+        {
+            RevisionInfo result = new RevisionInfo();
+            result.Type = EnumRevisionType.enDirectory;
+            return result;
+        }
+
+        static RevisionInfo CreateFileRevision(long size)
+        {
+            RevisionInfo result = new RevisionInfo();
+            result.Type = EnumRevisionType.enTextFile;
+            result.Size = size;
+            return result;
+        }
+
+        static string CreateRandomPath()
+        {
+            return "/" + Guid.NewGuid().ToString().Substring(0, 4);
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/MergetTreeResultMock.cs.meta b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/MergetTreeResultMock.cs.meta
new file mode 100644
index 0000000..6bd41d8
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/MergetTreeResultMock.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1ff85a1e2a86ce44388878f7ca1dd41c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/UnityIncomingChangesTreeTests.cs b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/UnityIncomingChangesTreeTests.cs
new file mode 100644
index 0000000..78d3a3f
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Developer/UnityIncomingChangesTreeTests.cs
@@ -0,0 +1,690 @@
+using NUnit.Framework;
+
+using Codice.Client.Commands;
+using Codice.Client.Commands.Mount;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using PlasticGui.WorkspaceWindow.IncomingChanges;
+using Unity.PlasticSCM.Editor.Views.IncomingChanges.Developer;
+
+namespace Unity.PlasticSCM.Tests.Editor.Views.IncomingChanges.Developer
+{
+    [TestFixture]
+    class UnityIncomingChangesTreeTests
+    {
+        [Test]
+        public void TestConflictNoMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            FileConflict fileConflict =
+                BuildMergeTreeResult.CreateFileConflict("/foo/bar.c");
+
+            conflicts.FileConflicts.Add(fileConflict);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo conflictChangeInfo = FindChangeInfo.FromFileConflict(
+                fileConflict, tree);
+
+            Assert.IsNotNull(
+                conflictChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(conflictChangeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestConflictWithMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            FileConflict fileConflict =
+                BuildMergeTreeResult.CreateFileConflict("/foo/bar.c");
+
+            FileConflict fileConflictMeta =
+                BuildMergeTreeResult.CreateFileConflict("/foo/bar.c.meta");
+
+            conflicts.FileConflicts.Add(fileConflict);
+            conflicts.FileConflicts.Add(fileConflictMeta);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo conflictChangeInfo = FindChangeInfo.FromFileConflict(
+                fileConflict, tree);
+
+            Assert.IsNotNull(
+                conflictChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(conflictChangeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestChangedNoMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            FileConflict fileConflict =
+                BuildMergeTreeResult.CreateModifiedDifference("/foo/bar.c");
+
+            conflicts.FilesModifiedOnSource.Add(fileConflict);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromFileConflict(
+                fileConflict, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestChangedWithMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            FileConflict fileConflict =
+                BuildMergeTreeResult.CreateFileConflict("/foo/bar.c");
+
+            FileConflict fileConflictMeta =
+                BuildMergeTreeResult.CreateFileConflict("/foo/bar.c.meta");
+
+            conflicts.FilesModifiedOnSource.Add(fileConflict);
+            conflicts.FilesModifiedOnSource.Add(fileConflictMeta);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromFileConflict(
+                fileConflict, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestMovedNoMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference difference =
+                BuildMergeTreeResult.CreateMovedDifference("/foo/bar.c", "/foo/var.c");
+
+            conflicts.MovesToApply.Add(difference);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                difference, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestMovedWithMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference difference =
+                BuildMergeTreeResult.CreateMovedDifference("/foo/bar.c", "/foo/var.c");
+            Difference differenceMeta =
+                BuildMergeTreeResult.CreateMovedDifference("/foo/bar.c.meta", "/foo/var.c.meta");
+
+            conflicts.MovesToApply.Add(difference);
+            conflicts.MovesToApply.Add(differenceMeta);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                difference, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change not should be null");
+        }
+
+        [Test]
+        public void TestChangedMovedWithMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            FileConflict fileConflict =
+                BuildMergeTreeResult.CreateFileConflict("/foo/var.c");
+
+            FileConflict fileConflictMeta =
+                BuildMergeTreeResult.CreateFileConflict("/foo/var.c.meta");
+
+            Difference difference =
+                BuildMergeTreeResult.CreateMovedDifference("/foo/bar.c", "/foo/var.c");
+            Difference differenceMeta =
+                BuildMergeTreeResult.CreateMovedDifference("/foo/bar.c.meta", "/foo/var.c.meta");
+
+            conflicts.FilesModifiedOnSource.Add(fileConflict);
+            conflicts.FilesModifiedOnSource.Add(fileConflictMeta);
+            conflicts.MovesToApply.Add(difference);
+            conflicts.MovesToApply.Add(differenceMeta);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo fileChangeInfo = FindChangeInfo.FromFileConflict(
+                fileConflict, tree);
+            IncomingChangeInfo differenceChangeInfo = FindChangeInfo.FromDifference(
+                difference, tree);
+
+            Assert.IsNotNull(
+                fileChangeInfo,
+                "FileConflict not found");
+
+            Assert.IsNotNull(
+                differenceChangeInfo,
+                "Difference not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(fileChangeInfo),
+                "Meta change for file conflict not should be null");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(differenceChangeInfo),
+                "Meta change for difference not should be null");
+        }
+
+        [Test]
+        public void TestAddedNoMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference difference =
+                BuildMergeTreeResult.CreateFileAddedDifference("/foo/bar.c");
+
+            conflicts.AddsToApply.Add(difference);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo addedChangeInfo = FindChangeInfo.FromDifference(
+                difference, tree);
+
+            Assert.IsNotNull(
+                addedChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(addedChangeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestAddedWithMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference difference =
+                BuildMergeTreeResult.CreateFileAddedDifference("/foo/bar.c");
+            Difference differenceMeta =
+                BuildMergeTreeResult.CreateFileAddedDifference("/foo/bar.c.meta");
+
+            conflicts.AddsToApply.Add(difference);
+            conflicts.AddsToApply.Add(differenceMeta);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo addedChangeInfo = FindChangeInfo.FromDifference(
+                difference, tree);
+
+            Assert.IsNotNull(
+                addedChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(addedChangeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestDeletedNoMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference difference =
+                BuildMergeTreeResult.CreateDeletedDifference("/foo/bar.c");
+
+            conflicts.DeletesToApply.Add(difference);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo addedChangeInfo = FindChangeInfo.FromDifference(
+                difference, tree);
+
+            Assert.IsNotNull(
+                addedChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(addedChangeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestDeletedWithMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference difference =
+                BuildMergeTreeResult.CreateFileAddedDifference("/foo/bar.c");
+            Difference differenceMeta =
+                BuildMergeTreeResult.CreateFileAddedDifference("/foo/bar.c.meta");
+
+            conflicts.DeletesToApply.Add(difference);
+            conflicts.DeletesToApply.Add(differenceMeta);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo addedChangeInfo = FindChangeInfo.FromDifference(
+                difference, tree);
+
+            Assert.IsNotNull(
+                addedChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(addedChangeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestOnlyMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            FileConflict fileConflictMeta =
+                BuildMergeTreeResult.CreateFileConflict("/foo/bar.c.meta");
+
+            conflicts.FileConflicts.Add(fileConflictMeta);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo conflictMetaChangeInfo = FindChangeInfo.FromFileConflict(
+                fileConflictMeta, tree);
+
+            Assert.IsNotNull(
+                conflictMetaChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(conflictMetaChangeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestDirectoryConflictNoMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            DirectoryConflict directoryConflict =
+                BuildMergeTreeResult.CreateEvilTwinConflict("/foo/bar.c");
+
+            conflicts.EvilTwins.Add(directoryConflict);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo conflictChangeInfo = FindChangeInfo.FromDirectoryConflict(
+                directoryConflict, tree);
+
+            Assert.IsNotNull(
+                conflictChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(conflictChangeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestDirectoryConflictWithMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            DirectoryConflict directoryConflict =
+                BuildMergeTreeResult.CreateEvilTwinConflict("/foo/bar.c");
+            DirectoryConflict directoryConflictMeta =
+                BuildMergeTreeResult.CreateEvilTwinConflict("/foo/bar.c.meta");
+
+            conflicts.EvilTwins.Add(directoryConflict);
+            conflicts.EvilTwins.Add(directoryConflictMeta);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo conflictChangeInfo = FindChangeInfo.FromDirectoryConflict(
+                directoryConflict, tree);
+
+            Assert.IsNotNull(
+                conflictChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(conflictChangeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestChangedWithDeletedMeta()
+        {
+            MergeTreeResult conflicts = new MergeTreeResult();
+
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            FileConflict modified =
+                BuildMergeTreeResult.CreateModifiedDifference("/foo/bar.c");
+
+            Difference deletedMeta =
+                BuildMergeTreeResult.CreateDeletedDifference("/foo/bar.c.meta");
+
+            conflicts.FilesModifiedOnSource.Add(modified);
+            conflicts.DeletesToApply.Add(deletedMeta);
+
+            UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
+                IncomingChangesTree.BuildIncomingChangeCategories(
+                    conflicts,
+                    new GetConflictResolutionMock(),
+                    rootMountPointWithPath));
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromFileConflict(
+                modified, tree);
+
+            IncomingChangeInfo deleteInfo = FindChangeInfo.FromDifference(
+                deletedMeta, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                deleteInfo,
+                "DeleteInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should be null");
+        }
+
+        static MountPointWithPath BuildRootMountPointWithPath()
+        {
+            return new MountPointWithPath(
+                MountPointId.WORKSPACE_ROOT,
+                new RepositorySpec()
+                {
+                    Name = "myrep",
+                    Server = "myserver:8084"
+                },
+                "/myroot");
+        }
+
+        class BuildMergeTreeResult
+        {
+            internal static Difference CreateFileAddedDifference(string path)
+            {
+                return new DiffChanged(
+                    CreateFileRevision(128), -1, path, -1,
+                    Difference.DiffNodeStatus.Added);
+            }
+
+            internal static Difference CreateMovedDifference(string srcPath, string dstPath)
+            {
+                return new DiffMoved(
+                    new RevisionInfo(),
+                    -1,
+                    srcPath,
+                    -1,
+                    dstPath, -1);
+            }
+
+            internal static Difference CreateDeletedDifference(string path)
+            {
+                return new DiffChanged(
+                    new RevisionInfo() { Type = EnumRevisionType.enTextFile },
+                    -1,
+                    path,
+                    -1,
+                    Difference.DiffNodeStatus.Deleted);
+            }
+
+            internal static FileConflict CreateModifiedDifference(string path)
+            {
+                DiffChanged src = new DiffChanged(
+                    CreateFileRevision(128),
+                    -1,
+                    path,
+                    -1,
+                    Difference.DiffNodeStatus.Changed);
+
+                return new FileConflict(src, null);
+            }
+
+            internal static FileConflict CreateFileConflict(string path)
+            {
+                DiffChanged src = new DiffChanged(
+                    CreateFileRevision(128), -1, path, -1,
+                    Difference.DiffNodeStatus.Changed);
+
+                DiffChanged dst = new DiffChanged(
+                    CreateFileRevision(128), -1, path, -1,
+                    Difference.DiffNodeStatus.Changed);
+
+                return new FileConflict(src, dst);
+            }
+
+            internal static EvilTwinConflict CreateEvilTwinConflict(string path)
+            {
+                DiffChanged src = new DiffChanged(
+                    CreateFileRevision(128), -1, path, -1,
+                    Difference.DiffNodeStatus.Added);
+
+                DiffChanged dst = new DiffChanged(
+                    CreateFileRevision(128), -1, path, -1,
+                    Difference.DiffNodeStatus.Added);
+
+                return new EvilTwinConflict(src, dst);
+            }
+
+            static RevisionInfo CreateDirectoryRevision()
+            {
+                RevisionInfo result = new RevisionInfo();
+                result.Type = EnumRevisionType.enDirectory;
+                return result;
+            }
+
+            static RevisionInfo CreateFileRevision(long size)
+            {
+                RevisionInfo result = new RevisionInfo();
+                result.Type = EnumRevisionType.enTextFile;
+                result.Size = size;
+                return result;
+            }
+        }
+
+        class GetConflictResolutionMock : IncomingChangesTree.IGetConflictResolution
+        {
+            string IncomingChangesTree.IGetConflictResolution.GetConflictResolution(
+                DirectoryConflict conflict)
+            {
+                return string.Empty;
+            }
+        }
+
+        class FindChangeInfo
+        {
+            internal static IncomingChangeInfo FromFileConflict(
+                FileConflict fileConflict,
+                UnityIncomingChangesTree tree)
+            {
+                foreach (IncomingChangesCategory category in tree.GetNodes())
+                {
+                    foreach (IncomingChangeInfo changeInfo in category.GetChanges())
+                    {
+                        if (changeInfo.CategoryType != IncomingChangesCategory.Type.FileConflicts &&
+                            changeInfo.CategoryType != IncomingChangesCategory.Type.Changed)
+                            continue;
+
+                        if (changeInfo.GetPath() != fileConflict.SrcDiff.Path)
+                            continue;
+
+                        return changeInfo;
+                    }
+                }
+
+                return null;
+            }
+
+            internal static IncomingChangeInfo FromDifference(
+                Difference difference,
+                UnityIncomingChangesTree tree)
+            {
+                foreach (IncomingChangesCategory category in tree.GetNodes())
+                {
+                    foreach (IncomingChangeInfo changeInfo in category.GetChanges())
+                    {
+                        if (changeInfo.CategoryType != IncomingChangesCategory.Type.Added &&
+                            changeInfo.CategoryType != IncomingChangesCategory.Type.Moved &&
+                            changeInfo.CategoryType != IncomingChangesCategory.Type.Deleted)
+                            continue;
+
+                        if (changeInfo.GetPath() != difference.Path)
+                            continue;
+
+                        return changeInfo;
+                    }
+                }
+
+                return null;
+            }
+
+            internal static IncomingChangeInfo FromDirectoryConflict(
+                DirectoryConflict directoryConflict,
+                UnityIncomingChangesTree tree)
+            {
+                foreach (IncomingChangesCategory category in tree.GetNodes())
+                {
+                    foreach (IncomingChangeInfo changeInfo in category.GetChanges())
+                    {
+                        if (changeInfo.CategoryType != IncomingChangesCategory.Type.DirectoryConflicts)
+                            continue;
+
+                        if (changeInfo.GetPath() != directoryConflict.SrcDiff.Path)
+                            continue;
+
+                        return changeInfo;
+                    }
+                }
+
+                return null;
+            }
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Gluon.meta b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Gluon.meta
new file mode 100644
index 0000000..9e29359
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Gluon.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6d3f1fb9f07fea845b8247499d6b01fb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTreeTests.cs b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTreeTests.cs
new file mode 100644
index 0000000..4fdd4e7
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTreeTests.cs
@@ -0,0 +1,732 @@
+using System.Collections.Generic;
+
+using NUnit.Framework;
+
+using Codice.Client.Commands;
+using Codice.Client.Commands.Mount;
+using Codice.Client.GameUI;
+using Codice.Client.GameUI.Update;
+using Codice.CM.Common;
+using Codice.CM.Common.Merge;
+using PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges;
+using Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon;
+
+namespace Unity.PlasticSCM.Tests.Editor.Views.IncomingChanges.Gluon
+{
+    [TestFixture]
+    class UnityIncomingChangesTreeTests
+    {
+        [Test]
+        public void TestConflictNoMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            GluonFileConflict fileConflict = Build.FileConflict(
+                rootMountPointWithPath,
+                "/foo/bar.c");
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            fileConflicts.Add(fileConflict);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo conflictChangeInfo = FindChangeInfo.FromFileConflict(
+                fileConflict, tree);
+
+            Assert.IsNotNull(
+                conflictChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(conflictChangeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestConflictWithMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            GluonFileConflict fileConflict = Build.FileConflict(
+                rootMountPointWithPath,
+                "/foo/bar.c");
+
+            GluonFileConflict fileConflictMeta = Build.FileConflict(
+                rootMountPointWithPath,
+                "/foo/bar.c.meta");
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            fileConflicts.Add(fileConflict);
+            fileConflicts.Add(fileConflictMeta);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo conflictChangeInfo = FindChangeInfo.FromFileConflict(
+                fileConflict, tree);
+
+            Assert.IsNotNull(
+                conflictChangeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(conflictChangeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestChangedNoMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference changed = Build.ChangedDifference(
+                "/foo/bar.c");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Changed.Add(changed);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                changed, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestChangedWithMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference changed = Build.ChangedDifference(
+                "/foo/bar.c");
+
+            Difference changedMeta = Build.ChangedDifference(
+                "/foo/bar.c.meta");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Changed.Add(changed);
+            outOfDateItems.Changed.Add(changedMeta);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                changed, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestMovedNoMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference moved = Build.MovedDifference(
+                "/foo/bar.c",
+                "/foo/var.c");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Changed.Add(moved);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                moved, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestMovedWithMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference moved = Build.MovedDifference(
+                "/foo/bar.c",
+                "/foo/var.c");
+
+            Difference movedMeta = Build.MovedDifference(
+                "/foo/bar.c.meta",
+                "/foo/var.c.meta");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Moved.Add(moved);
+            outOfDateItems.Moved.Add(movedMeta);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                moved, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestChangedMovedWithMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference changed =
+                Build.ChangedDifference("/foo/var.c");
+
+            Difference changedMeta =
+                Build.ChangedDifference("/foo/var.c.meta");
+
+            Difference moved =
+                Build.MovedDifference(
+                    "/foo/bar.c", "/foo/var.c");
+            Difference movedMeta =
+                Build.MovedDifference(
+                    "/foo/bar.c.meta", "/foo/var.c.meta");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Changed.Add(changed);
+            outOfDateItems.Changed.Add(changedMeta);
+            outOfDateItems.Moved.Add(moved);
+            outOfDateItems.Moved.Add(movedMeta);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                changed, tree);
+            IncomingChangeInfo movedChangeInfo = FindChangeInfo.FromDifference(
+                moved, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangedInfo not found");
+
+            Assert.IsNotNull(
+                movedChangeInfo,
+                "MovedChangedInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change for changed not should be null");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(movedChangeInfo),
+                "Meta change for moved should not be null");
+        }
+
+        [Test]
+        public void TestAddedNoMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference added = Build.AddedDifference(
+                "/foo/bar.c");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Added.Add(added);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                added, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestAddedWithMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference added = Build.AddedDifference(
+                "/foo/bar.c");
+
+            Difference addedMeta = Build.AddedDifference(
+                "/foo/bar.c.meta");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Added.Add(added);
+            outOfDateItems.Added.Add(addedMeta);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                added, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestDeletedNoMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference deleted = Build.DeletedDifference(
+                "/foo/bar.c");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Deleted.Add(deleted);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                deleted, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestDeletedWithMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference deleted = Build.DeletedDifference(
+                "/foo/bar.c");
+
+            Difference deletedMeta = Build.DeletedDifference(
+                "/foo/bar.c.meta");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Deleted.Add(deleted);
+            outOfDateItems.Deleted.Add(deletedMeta);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                deleted, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should not be null");
+        }
+
+        [Test]
+        public void TestChangedWithDeletedMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference changed = Build.ChangedDifference(
+                "/foo/bar.c");
+
+            Difference deletedMeta = Build.DeletedDifference(
+                "/foo/bar.c.meta");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Changed.Add(changed);
+            outOfDateItems.Deleted.Add(deletedMeta);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfo = FindChangeInfo.FromDifference(
+                changed, tree);
+
+            IncomingChangeInfo deleteInfo = FindChangeInfo.FromDifference(
+                deletedMeta, tree);
+
+            Assert.IsNotNull(
+                changeInfo,
+                "ChangeInfo not found");
+
+            Assert.IsNotNull(
+                deleteInfo,
+                "DeleteInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(changeInfo),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestOnlyMeta()
+        {
+            MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
+
+            Difference changedMeta = Build.ChangedDifference(
+                "/foo/bar.c.meta");
+
+            OutOfDateItemsByMount outOfDateItems = new OutOfDateItemsByMount()
+            {
+                Mount = rootMountPointWithPath
+            };
+
+            outOfDateItems.Changed.Add(changedMeta);
+
+            CheckedStateManager checkedStateManager = new CheckedStateManager();
+            List<OutOfDateItemsByMount> outOfDateItemsByMount =
+                new List<OutOfDateItemsByMount>();
+            List<GluonFileConflict> fileConflicts = new List<GluonFileConflict>();
+
+            outOfDateItemsByMount.Add(outOfDateItems);
+
+            IncomingChangesTree innerTree = IncomingChangesTree.BuildIncomingChangeCategories(
+                checkedStateManager,
+                outOfDateItemsByMount,
+                fileConflicts);
+
+            UnityIncomingChangesTree tree =
+                UnityIncomingChangesTree.BuildIncomingChangeCategories(innerTree);
+
+            IncomingChangeInfo changeInfoMeta = FindChangeInfo.FromDifference(
+                changedMeta, tree);
+
+            Assert.IsNotNull(
+                changeInfoMeta,
+                "ChangeInfo not found");
+
+            Assert.IsNull(
+                tree.GetMetaChange(changeInfoMeta),
+                "Meta change should be null");
+        }
+
+        static MountPointWithPath BuildRootMountPointWithPath()
+        {
+            return new MountPointWithPath(
+                MountPointId.WORKSPACE_ROOT,
+                new RepositorySpec()
+                {
+                    Name = "myrep",
+                    Server = "myserver:8084"
+                },
+                "/myroot");
+        }
+
+        class Build
+        {
+            internal static GluonFileConflict FileConflict(
+                MountPointWithPath mount,
+                string path)
+            {
+                return new GluonFileConflict(
+                    mount,
+                    BuildFileRevision(),
+                    BuildFileRevision(),
+                    path);
+            }
+
+            internal static Difference AddedDifference(
+                string path)
+            {
+                return new DiffChanged(
+                    BuildFileRevision(), -1, path, -1,
+                    Difference.DiffNodeStatus.Added);
+            }
+
+            internal static Difference MovedDifference(
+                string srcPath,
+                string dstPath)
+            {
+                return new DiffMoved(
+                    new RevisionInfo(),
+                    -1,
+                    srcPath,
+                    -1,
+                    dstPath, -1);
+            }
+
+            internal static Difference DeletedDifference(
+                string path)
+            {
+                return new DiffChanged(
+                    new RevisionInfo() { Type = EnumRevisionType.enTextFile },
+                    -1,
+                    path,
+                    -1,
+                    Difference.DiffNodeStatus.Deleted);
+            }
+
+            internal static Difference ChangedDifference(
+                string path)
+            {
+                return new DiffChanged(
+                    BuildFileRevision(),
+                    -1,
+                    path,
+                    -1,
+                    Difference.DiffNodeStatus.Changed);
+            }
+
+            static RevisionInfo BuildFileRevision()
+            {
+                RevisionInfo result = new RevisionInfo();
+                result.Type = EnumRevisionType.enTextFile;
+                result.Size = 128;
+                return result;
+            }
+        }
+
+        class FindChangeInfo
+        {
+            internal static IncomingChangeInfo FromFileConflict(
+                GluonFileConflict fileConflict,
+                UnityIncomingChangesTree tree)
+            {
+                foreach (IncomingChangeCategory category in tree.GetNodes())
+                {
+                    foreach (IncomingChangeInfo changeInfo in category.GetChanges())
+                    {
+                        if (changeInfo.CategoryType != IncomingChangeCategory.Type.Conflicted)
+                            continue;
+
+                        if (changeInfo.GetPath() != fileConflict.CmPath)
+                            continue;
+
+                        return changeInfo;
+                    }
+                }
+
+                return null;
+            }
+
+            internal static IncomingChangeInfo FromDifference(
+                Difference difference,
+                UnityIncomingChangesTree tree)
+            {
+                foreach (IncomingChangeCategory category in tree.GetNodes())
+                {
+                    foreach (IncomingChangeInfo changeInfo in category.GetChanges())
+                    {
+                        if (changeInfo.CategoryType == IncomingChangeCategory.Type.Conflicted)
+                            continue;
+
+                        if (changeInfo.GetPath() != difference.Path)
+                            continue;
+
+                        return changeInfo;
+                    }
+                }
+
+                return null;
+            }
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTreeTests.cs.meta b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTreeTests.cs.meta
new file mode 100644
index 0000000..8dbfbc0
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/IncomingChanges/Gluon/UnityIncomingChangesTreeTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c8344e9aa86de7a438d651e0ac066819
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/PendingChanges.meta b/Tests/Editor/PlasticSCM/Views/PendingChanges.meta
new file mode 100644
index 0000000..f984f0f
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/PendingChanges.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e622db1671757eb4785c64d7dad13723
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTreeTests.cs b/Tests/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTreeTests.cs
new file mode 100644
index 0000000..cdb6212
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTreeTests.cs
@@ -0,0 +1,463 @@
+using System.Collections.Generic;
+
+using NUnit.Framework;
+
+using Codice.Client.BaseCommands;
+using Codice.Client.Commands;
+using Codice.CM.Common;
+using Unity.PlasticSCM.Editor.Views.PendingChanges;
+
+namespace Unity.PlasticSCM.Tests.Editor.Views.PendingChanges
+{
+    [TestFixture]
+    class UnityPendingChangesTreeTests
+    {
+        [Test]
+        public void TestAddedNoMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo added = new ChangeInfo()
+            {
+                Path = "/foo/foo.c"
+            };
+
+            pendingChanges.Added.Add(added);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsNull(
+                tree.GetMetaChange(added),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestAddedWithMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo added = new ChangeInfo()
+            {
+                Path = "/foo/foo.c"
+            };
+
+            ChangeInfo addedMeta = new ChangeInfo()
+            {
+                Path = "/foo/foo.c.meta"
+            };
+
+            pendingChanges.Added.Add(added);
+            pendingChanges.Added.Add(addedMeta);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsTrue(
+                pendingChanges.Added.Contains(added),
+                "Pending changes should contain the change");
+
+            Assert.IsFalse(
+                pendingChanges.Added.Contains(addedMeta),
+                "Pending changes should not contain the meta");
+
+            Assert.AreEqual(addedMeta, tree.GetMetaChange(added));
+        }
+
+        [Test]
+        public void TestFileAddedMetaPrivate()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo added = new ChangeInfo()
+            {
+                Path = "/foo/foo.c",
+                ChangeTypes = ChangeTypes.Added,
+            };
+
+            ChangeInfo privateMeta = new ChangeInfo()
+            {
+                Path = "/foo/foo.c.meta",
+                ChangeTypes = ChangeTypes.Private,
+            };
+
+            pendingChanges.Added.Add(added);
+            pendingChanges.Added.Add(privateMeta);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsTrue(
+                pendingChanges.Added.Contains(added),
+                "Pending changes should contain the change");
+
+            Assert.IsTrue(
+                pendingChanges.Added.Contains(privateMeta),
+                "Pending changes should contain the meta");
+        }
+
+        [Test]
+        public void TestDeletedNoMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo deleted = new ChangeInfo()
+            {
+                Path = "/foo/foo.c"
+            };
+
+            pendingChanges.Deleted.Add(deleted);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsNull(
+                tree.GetMetaChange(deleted),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestDeletedWithMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo deleted = new ChangeInfo()
+            {
+                Path = "/foo/foo.c"
+            };
+
+            ChangeInfo deletedMeta = new ChangeInfo()
+            {
+                Path = "/foo/foo.c.meta"
+            };
+
+            pendingChanges.Deleted.Add(deleted);
+            pendingChanges.Deleted.Add(deletedMeta);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsTrue(
+                pendingChanges.Deleted.Contains(deleted),
+                "Pending changes should contain the change");
+
+            Assert.IsFalse(
+                pendingChanges.Deleted.Contains(deletedMeta),
+                "Pending changes should not contain the meta");
+
+            Assert.AreEqual(deletedMeta, tree.GetMetaChange(deleted));
+        }
+
+        [Test]
+        public void TestChangedNoMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo changed = new ChangeInfo()
+            {
+                Path = "/foo/foo.c"
+            };
+
+            pendingChanges.Changed.Add(changed);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsNull(
+                tree.GetMetaChange(changed),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestChangedWithMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo changed = new ChangeInfo()
+            {
+                Path = "/foo/foo.c"
+            };
+
+            ChangeInfo changedMeta = new ChangeInfo()
+            {
+                Path = "/foo/foo.c.meta"
+            };
+
+            pendingChanges.Changed.Add(changed);
+            pendingChanges.Changed.Add(changedMeta);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsTrue(
+                pendingChanges.Changed.Contains(changed),
+                "Pending changes should contain the change");
+
+            Assert.IsFalse(
+                pendingChanges.Changed.Contains(changedMeta),
+                "Pending changes should not contain the meta");
+
+            Assert.AreEqual(changedMeta, tree.GetMetaChange(changed));
+        }
+
+        [Test]
+        public void TestMovedNoMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo moved = new ChangeInfo()
+            {
+                OldPath = "/foo/foo.c",
+                Path = "/foo/bar/newfoo.c",
+            };
+
+            pendingChanges.Moved.Add(moved);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsNull(
+                tree.GetMetaChange(moved),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestMovedWithMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo moved = new ChangeInfo()
+            {
+                OldPath = "/foo/foo.c",
+                Path = "/foo/bar/newfoo.c",
+            };
+
+            ChangeInfo movedMeta = new ChangeInfo()
+            {
+                OldPath = "/foo/foo.c.meta",
+                Path = "/foo/bar/newfoo.c.meta",
+            };
+
+            pendingChanges.Moved.Add(moved);
+            pendingChanges.Moved.Add(movedMeta);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsTrue(
+                pendingChanges.Moved.Contains(moved),
+                "Pending changes should contain the change");
+
+            Assert.IsFalse(
+                pendingChanges.Moved.Contains(movedMeta),
+                "Pending changes should not contain the meta");
+
+            Assert.AreEqual(movedMeta, tree.GetMetaChange(moved));
+        }
+
+        [Test]
+        public void TestOnlyMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo addedMeta = new ChangeInfo()
+            {
+                Path = "/foo/foo.c.meta",
+            };
+
+            pendingChanges.Added.Add(addedMeta);
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager());
+
+            Assert.IsNull(
+                tree.GetMetaChange(addedMeta),
+                "Meta change should be null");
+        }
+
+        [Test]
+        public void TestCheckedChangesWithMeta()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo added = new ChangeInfo()
+            {
+                Path = "/foo/foo.c",
+            };
+
+            ChangeInfo addedMeta = new ChangeInfo()
+            {
+                Path = "/foo/foo.c",
+            };
+
+            pendingChanges.Added.Add(added);
+            pendingChanges.Added.Add(addedMeta);
+
+            PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager checkedStateManager =
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager();
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                checkedStateManager);
+
+            checkedStateManager.Update(added, true);
+
+            List<ChangeInfo> changes;
+            List<ChangeInfo> dependenciesCandidates;
+
+            tree.GetCheckedChanges(
+                false,
+                out changes,
+                out dependenciesCandidates);
+
+            Assert.IsTrue(changes.Contains(added),
+                "Changes should contains the change");
+
+            Assert.IsTrue(changes.Contains(addedMeta),
+                "Changes should contains the meta change");
+        }
+
+        [Test]
+        public void TestCheckedChangesWithDependenciesCandidates()
+        {
+            UnityPendingChangesTree tree = new UnityPendingChangesTree();
+
+            WorkspaceInfo wkInfo = new WorkspaceInfo("foo", "/foo");
+
+            PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges pendingChanges =
+                new PlasticGui.WorkspaceWindow.PendingChanges.PendingChanges(wkInfo);
+
+            ChangeInfo dir = new ChangeInfo()
+            {
+                Path = "/foo/bar",
+            };
+
+            ChangeInfo dirMeta = new ChangeInfo()
+            {
+                Path = "/foo/bar.meta",
+            };
+
+
+            ChangeInfo added = new ChangeInfo()
+            {
+                Path = "/foo/bar/foo.c",
+            };
+
+            ChangeInfo addedMeta = new ChangeInfo()
+            {
+                Path = "/foo/bar/foo.c.meta",
+            };
+
+            pendingChanges.Added.Add(dir);
+            pendingChanges.Added.Add(dirMeta);
+            pendingChanges.Added.Add(added);
+            pendingChanges.Added.Add(addedMeta);
+
+            PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager checkedStateManager =
+                new PlasticGui.WorkspaceWindow.PendingChanges.CheckedStateManager();
+
+            tree.BuildChangeCategories(
+                wkInfo.ClientPath,
+                pendingChanges,
+                checkedStateManager);
+
+            checkedStateManager.Update(added, true);
+
+            List<ChangeInfo> changes;
+            List<ChangeInfo> dependenciesCandidates;
+
+            tree.GetCheckedChanges(
+                false,
+                out changes,
+                out dependenciesCandidates);
+
+            Assert.IsTrue(changes.Contains(added),
+                "Changes should contains the change");
+
+            Assert.IsTrue(changes.Contains(addedMeta),
+                "Changes should contains the meta change");
+
+            Assert.IsTrue(dependenciesCandidates.Contains(dir),
+                "Dependencies candidates should contains the dir");
+
+            Assert.IsTrue(dependenciesCandidates.Contains(dirMeta),
+                "Dependencies candidates should contains the meta ir");
+        }
+    }
+}
diff --git a/Tests/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTreeTests.cs.meta b/Tests/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTreeTests.cs.meta
new file mode 100644
index 0000000..f33b360
--- /dev/null
+++ b/Tests/Editor/PlasticSCM/Views/PendingChanges/UnityPendingChangesTreeTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3d8029f2d5485ef4d97abedb1b68891e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/README.md b/Tests/README.md
index 93d5feb..4290fe3 100644
--- a/Tests/README.md
+++ b/Tests/README.md
@@ -6,14 +6,15 @@ This is the structure of the project:
 ```none
 <root>
   ├── .tests.json
-  └── Editor/
-      ├── Unity.CollabProxy.EditorTests.asmdef
-      ├── Components/
-      ├── Models/
-      ├── Ppresenters/
-      ├── Scenario/
-      ├── UserInterface/
-      └── Views/
+  └── Collaborate
+      └── Editor/
+          ├── Components/
+          ├── Models/
+          ├── Ppresenters/
+          ├── Scenario/
+          ├── UserInterface/
+          ├── Views/
+          └── Unity.CollabProxy.EditorTests.asmdef
 ```
 
 Each directory features tests and mock classes for classes in the editor code.
diff --git a/Third Party Notices.md b/Third Party Notices.md
index 570afdb..c74f5c5 100644
--- a/Third Party Notices.md	
+++ b/Third Party Notices.md	
@@ -1,7 +1,230 @@
 This package contains third-party software components governed by the license(s) indicated below:
 ---------
+
+Component Name: Antlr3/Antlr
+
+License Type: BSD
+
+[The BSD License]
+Copyright (c) 2010 Terence Parr
+All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---------
+Component Name: Log4Net
+
+License Type: Apache 2.0
+
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+---------
 Component Name: [provide component name]
 
 License Type: [Provide license type, i.e. "MIT", "Apache 2.0"]
 
-[Provide License Details]
+[Provide License Details]
\ No newline at end of file
diff --git a/package.json b/package.json
index 34cc793..bb56d7e 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "com.unity.collab-proxy",
-  "displayName": "Unity Collaborate",
-  "version": "1.3.9",
+  "displayName": "Version Control",
+  "version": "1.5.7",
   "unity": "2020.1",
-  "unityRelease": "0a22",
-  "description": "Collaborate with your teammates with the official version control system for Unity. Collaborate is a simple way for teams to save, share, and sync your Unity project.",
+  "unityRelease": "14f1",
+  "description": "The Version Control package gives you the ability to use either Collaborate or Plastic SCM for Unity (beta) in the Unity editor. To use Plastic SCM for Unity (beta), a Plastic SCM subscription is required. Learn more about how you can get started for free by visiting plasticscm.com.",
   "keywords": [
     "vsc",
     "version",
@@ -17,14 +17,16 @@
     "cloud",
     "backup"
   ],
+  "dependencies": {
+    "com.unity.nuget.newtonsoft-json": "2.0.0"
+  },
   "category": "Editor",
-  "dependencies": {},
   "upmCi": {
-    "footprint": "5ee91151aeac08f43ee5fec4106e0b5eec2312b5"
+    "footprint": "ffb5ec0186fda331a2b983e3319c233a7811ec0a"
   },
   "repository": {
     "url": "https://github.cds.internal.unity3d.com/unity/com.unity.cloud.collaborate.git",
     "type": "git",
-    "revision": "fa825106f349f996acff22f718845eab46ca2d7c"
+    "revision": "f079d307344f568804d3ea6d781013135e614e45"
   }
 }