diff --git a/.appveyor/gitDescribe.ps1 b/.appveyor/gitDescribe.ps1
new file mode 100644
index 00000000..01e40629
--- /dev/null
+++ b/.appveyor/gitDescribe.ps1
@@ -0,0 +1,63 @@
+if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
+{
+ $Env:VersionTag = "PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
+ Return $Env:VersionTag
+}
+
+$currentCommitSha = $Env:CurrentCommitSha
+$githubRepoApiUri = $Env:githubRepoApiUri #"https://api.github.com/repos/:user/:repo/"
+$Env:VersionTag = ""
+$gitApiAuthHeader = @{
+ Authorization = 'Basic ' + [Convert]::ToBase64String(
+ [Text.Encoding]::ASCII.GetBytes($Env:GitHubKey + ":x-oauth-basic"));
+ };
+# Inline-if helper function
+Function IIf($If, $Right, $Wrong) {If ($If) {$Right} Else {$Wrong}}
+
+try{
+ $result = Invoke-RestMethod -Uri "$($githubRepoApiUri)git/refs/tags" -Method 'GET' -Headers $gitApiAuthHeader
+}
+catch [System.Net.WebException]
+{
+ # Error getting tags
+ $statusCode = [int]$_.Exception.Response.StatusCode
+ $html = $_.Exception.Response.StatusDescription
+ Write-Host "Error getting tags ($html)"
+ Return ;
+}
+
+# Get tag info
+try{
+ $tagsInfo = ($result | % { "$($githubRepoApiUri)git/tags/$($_.object.sha)" ;} | % { Invoke-RestMethod -Method 'GET' -Uri $($_) -Headers $gitApiAuthHeader})
+}
+catch [System.Net.WebException]
+{
+ # Error getting tags
+ $statusCode = [int]$_.Exception.Response.StatusCode
+ $html = $_.Exception.Response.StatusDescription
+ Write-Host "Error getting info for tags ($html)"
+ Return ;
+}
+
+# Compare taged commits with current commit
+try{
+ $commitTagComp = $tagsInfo | select sha, tag, tagger, @{n='dist';e={[int](Invoke-RestMethod -Method 'GET' -Uri "$($githubRepoApiUri)compare/$($_.object.sha)...$currentCommitSha" -Headers $gitApiAuthHeader | % { (IIf ($_.status -ne "diverged") ($_.ahead_by) (-1))})}}
+}
+catch [System.Net.WebException]
+{
+ # Error comparing tags
+ $statusCode = [int]$_.Exception.Response.StatusCode
+ $html = $_.Exception.Response.StatusDescription
+ Write-Host "Error comparing tags with current commit ($html)"
+ Return ;
+}
+
+$latestTag = $commitTagComp | where {$_.dist -ge 0} | sort-object -property @{Expression="dist";Descending=$false}, @{Expression="tag";Descending=$false} | Select-Object -first 1
+
+if(!$latestTag){
+ Write-Host "Commit not describable"
+ Return ;
+}
+
+$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-g$($currentCommitSha.Substring(0,7))"
+Return $Env:VersionTag
diff --git a/.appveyor/moveTagForSpecialBranches.ps1 b/.appveyor/moveTagForSpecialBranches.ps1
new file mode 100644
index 00000000..622b14b6
--- /dev/null
+++ b/.appveyor/moveTagForSpecialBranches.ps1
@@ -0,0 +1,19 @@
+if($Env:APPVEYOR_REPO_TAG -ne "true" -and (-not $Env:APPVEYOR_PULL_REQUEST_NUMBER)) {
+ Write-Host "Push without tag detected"
+ if($Env:APPVEYOR_REPO_BRANCH -eq "develop"){
+ Write-Host "Nightly build branch was detected"
+ $targetTag = "Nightly"
+ $Env:NIGHTLY_BUILD = true
+ }
+ else{
+ Write-Host "No special branch found"
+ Return
+ }
+ Write-Host "Moving tag $targetTag to $Env:APPVEYOR_REPO_BRANCH"
+ git config --global user.email "noreply@vocaluxe.org";
+ git config --global user.name "VocaluxeBuildBot";
+ git tag "$targetTag" -f;
+ git push -q -f "https://$($Env:GitHubKey):x-oauth-basic@github.com/Vocaluxe/Vocaluxe.git" "$targetTag";
+
+ Write-Host "Tag $targetTag points now to the head of branch $Env:APPVEYOR_REPO_BRANCH"
+}
\ No newline at end of file
diff --git a/.appveyor/nightlyDetect.ps1 b/.appveyor/nightlyDetect.ps1
new file mode 100644
index 00000000..34048cce
--- /dev/null
+++ b/.appveyor/nightlyDetect.ps1
@@ -0,0 +1,17 @@
+if($Env:APPVEYOR_REPO_TAG -eq "true") {
+ Write-Host "Taged commit detected"
+ $targetTag = $Env:APPVEYOR_REPO_TAG_NAME
+ Write-Host "Tag=$targetTag"
+ $Env:NIGHTLY_BUILD = "false"
+ if($targetTag -eq "Nightly") {
+ $Env:NIGHTLY_BUILD = "true"
+ Write-Host "This is a nightly build"
+ }
+ else
+ {
+ Write-Host "This is NOT a nightly build"
+ }
+}
+else{
+ Return;
+}
\ No newline at end of file
diff --git a/.appveyor/prepareDeploy.ps1 b/.appveyor/prepareDeploy.ps1
new file mode 100644
index 00000000..099102a8
--- /dev/null
+++ b/.appveyor/prepareDeploy.ps1
@@ -0,0 +1,54 @@
+if($Env:APPVEYOR_REPO_TAG -eq "true") {
+ $targetTag = $Env:APPVEYOR_REPO_TAG_NAME
+ Write-Host "Deploy for tag $targetTag"
+}
+else{
+ Write-Host "No tag found: no preparation required"
+ Return;
+}
+
+$getRelaseInfoParams = @{
+ Uri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/releases/tags/$targetTag";
+ Method = 'GET';
+}
+try{
+ $result = Invoke-RestMethod @getRelaseInfoParams
+}
+catch [System.Net.WebException]
+{
+ # No Release found for this tag
+ $statusCode = [int]$_.Exception.Response.StatusCode
+ $html = $_.Exception.Response.StatusDescription
+ Write-Host "No Release found for this tag ($html): $($Env:APPVEYOR_REPO_TAG_NAME)"
+ Return;
+}
+
+$assetId = ($result.assets | where {$_.name -EQ "Vocaluxe_$($Env:APPVEYOR_REPO_TAG_NAME)_Windows_$($Env:PLATFORM).zip" } | Select-Object -first 1 ).id
+
+if(!$assetId){
+ # No matching asset found in this release
+ Write-Host "No matching asset found in this release: Vocaluxe_$($Env:APPVEYOR_REPO_TAG_NAME)_Windows_$($Env:PLATFORM).zip"
+ Return;
+}
+
+$deleteAssetParams = @{
+ Uri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/releases/assets/$assetId";
+ Method = 'DELETE';
+ Headers = @{
+ Authorization = 'Basic ' + [Convert]::ToBase64String(
+ [Text.Encoding]::ASCII.GetBytes($Env:GitHubKey + ":x-oauth-basic"));
+ }
+}
+try{
+ $result = Invoke-RestMethod @deleteAssetParams
+ Write-Host "Successfully deleted asset: Vocaluxe_$($Env:APPVEYOR_REPO_TAG_NAME)_Windows_$($Env:PLATFORM).zip"
+}
+catch [System.Net.WebException]
+{
+ # Could not delete asset
+ $statusCode = [int]$_.Exception.Response.StatusCode
+ $html = $_.Exception.Response.StatusDescription
+ Write-Host "Could not delete asset ($html): Vocaluxe_$($Env:APPVEYOR_REPO_TAG_NAME)_Windows_$($Env:PLATFORM).zip"
+ Return;
+}
+
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4b8d2072..25bfbb08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ Thumbs.db
*.psess
*.vshost.*
*.userprefs
+*.user
/*.vsp
/*.ctl
/Output/Config.xml
@@ -57,3 +58,8 @@ Thumbs.db
/PhoneGap/
/TestResults
/VocaluxeTests/bin
+/Output/libs
+/Output/Themes
+/packages
+/Output/x64
+/Output/x86
diff --git a/NuGet.Config b/NuGet.Config
new file mode 100644
index 00000000..ec2f39ad
--- /dev/null
+++ b/NuGet.Config
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/AForge.Video.DirectShow.dll b/Output/AForge.Video.DirectShow.dll
deleted file mode 100644
index e3f806f3..00000000
Binary files a/Output/AForge.Video.DirectShow.dll and /dev/null differ
diff --git a/Output/AForge.Video.dll b/Output/AForge.Video.dll
deleted file mode 100644
index dc67243e..00000000
Binary files a/Output/AForge.Video.dll and /dev/null differ
diff --git a/Output/Community.CsharpSqlite.dll b/Output/Community.CsharpSqlite.dll
deleted file mode 100644
index 2fac1a19..00000000
Binary files a/Output/Community.CsharpSqlite.dll and /dev/null differ
diff --git a/Output/Interop.NetFwTypeLib.dll b/Output/Interop.NetFwTypeLib.dll
deleted file mode 100644
index 135c15c5..00000000
Binary files a/Output/Interop.NetFwTypeLib.dll and /dev/null differ
diff --git a/Output/Newtonsoft.Json.dll b/Output/Newtonsoft.Json.dll
deleted file mode 100644
index 339e470c..00000000
Binary files a/Output/Newtonsoft.Json.dll and /dev/null differ
diff --git a/Output/OpenTK.Compatibility.dll b/Output/OpenTK.Compatibility.dll
deleted file mode 100644
index 46bbbf70..00000000
Binary files a/Output/OpenTK.Compatibility.dll and /dev/null differ
diff --git a/Output/OpenTK.Compatibility.dll.config b/Output/OpenTK.Compatibility.dll.config
deleted file mode 100644
index 45afd40a..00000000
--- a/Output/OpenTK.Compatibility.dll.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Output/OpenTK.GLControl.dll b/Output/OpenTK.GLControl.dll
deleted file mode 100644
index 8fad65c9..00000000
Binary files a/Output/OpenTK.GLControl.dll and /dev/null differ
diff --git a/Output/OpenTK.dll b/Output/OpenTK.dll
deleted file mode 100644
index e792eef0..00000000
Binary files a/Output/OpenTK.dll and /dev/null differ
diff --git a/Output/OpenTK.dll.config b/Output/OpenTK.dll.config
deleted file mode 100644
index e3856d0c..00000000
--- a/Output/OpenTK.dll.config
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Output/PortAudioSharp.dll b/Output/PortAudioSharp.dll
deleted file mode 100644
index f48cfc2a..00000000
Binary files a/Output/PortAudioSharp.dll and /dev/null differ
diff --git a/Output/PortAudioSharp.dll.config b/Output/PortAudioSharp.dll.config
deleted file mode 100644
index 9147bca7..00000000
--- a/Output/PortAudioSharp.dll.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/Output/QRCoder.dll b/Output/QRCoder.dll
deleted file mode 100644
index 7ae465f4..00000000
Binary files a/Output/QRCoder.dll and /dev/null differ
diff --git a/Output/Security.Cryptography.dll b/Output/Security.Cryptography.dll
deleted file mode 100644
index d1919854..00000000
Binary files a/Output/Security.Cryptography.dll and /dev/null differ
diff --git a/Output/Themes/Ambient.xml b/Output/Themes/Ambient.xml
deleted file mode 100644
index 91b0c674..00000000
--- a/Output/Themes/Ambient.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 5
-
- Ambient
- bohning
- 0
- 2
-
-
- Cursor
- 40
- 40
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Button.png b/Output/Themes/Ambient/Button.png
deleted file mode 100644
index 47a97da5..00000000
Binary files a/Output/Themes/Ambient/Button.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Close.png b/Output/Themes/Ambient/Close.png
deleted file mode 100644
index b8b8a994..00000000
Binary files a/Output/Themes/Ambient/Close.png and /dev/null differ
diff --git a/Output/Themes/Ambient/CoverBackground.png b/Output/Themes/Ambient/CoverBackground.png
deleted file mode 100644
index 353322df..00000000
Binary files a/Output/Themes/Ambient/CoverBackground.png and /dev/null differ
diff --git a/Output/Themes/Ambient/CoverTile.png b/Output/Themes/Ambient/CoverTile.png
deleted file mode 100644
index e76d04e3..00000000
Binary files a/Output/Themes/Ambient/CoverTile.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Cursor.png b/Output/Themes/Ambient/Cursor.png
deleted file mode 100644
index 9c9e8288..00000000
Binary files a/Output/Themes/Ambient/Cursor.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Delete.png b/Output/Themes/Ambient/Delete.png
deleted file mode 100644
index 46a686ad..00000000
Binary files a/Output/Themes/Ambient/Delete.png and /dev/null differ
diff --git a/Output/Themes/Ambient/DuetIcon.png b/Output/Themes/Ambient/DuetIcon.png
deleted file mode 100644
index 1ba7a353..00000000
Binary files a/Output/Themes/Ambient/DuetIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/EnergyBeam.png b/Output/Themes/Ambient/EnergyBeam.png
deleted file mode 100644
index 80802776..00000000
Binary files a/Output/Themes/Ambient/EnergyBeam.png and /dev/null differ
diff --git a/Output/Themes/Ambient/LyricHelper.png b/Output/Themes/Ambient/LyricHelper.png
deleted file mode 100644
index c4788bfd..00000000
Binary files a/Output/Themes/Ambient/LyricHelper.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Lyrics.png b/Output/Themes/Ambient/Lyrics.png
deleted file mode 100644
index f27b96de..00000000
Binary files a/Output/Themes/Ambient/Lyrics.png and /dev/null differ
diff --git a/Output/Themes/Ambient/MedleyCalcIcon.png b/Output/Themes/Ambient/MedleyCalcIcon.png
deleted file mode 100644
index 25b73f10..00000000
Binary files a/Output/Themes/Ambient/MedleyCalcIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/MedleyTagIcon.png b/Output/Themes/Ambient/MedleyTagIcon.png
deleted file mode 100644
index 2bf40bdc..00000000
Binary files a/Output/Themes/Ambient/MedleyTagIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Menu.png b/Output/Themes/Ambient/Menu.png
deleted file mode 100644
index c5c56a49..00000000
Binary files a/Output/Themes/Ambient/Menu.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Minus.png b/Output/Themes/Ambient/Minus.png
deleted file mode 100644
index 9bdede57..00000000
Binary files a/Output/Themes/Ambient/Minus.png and /dev/null differ
diff --git a/Output/Themes/Ambient/NextIcon.png b/Output/Themes/Ambient/NextIcon.png
deleted file mode 100644
index fb6bf6c4..00000000
Binary files a/Output/Themes/Ambient/NextIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Pause.png b/Output/Themes/Ambient/Pause.png
deleted file mode 100644
index 50e73658..00000000
Binary files a/Output/Themes/Ambient/Pause.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PauseIcon.png b/Output/Themes/Ambient/PauseIcon.png
deleted file mode 100644
index 6f9c8870..00000000
Binary files a/Output/Themes/Ambient/PauseIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PerfectNoteStar.png b/Output/Themes/Ambient/PerfectNoteStar.png
deleted file mode 100644
index 9b29e9b3..00000000
Binary files a/Output/Themes/Ambient/PerfectNoteStar.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PlayIcon.png b/Output/Themes/Ambient/PlayIcon.png
deleted file mode 100644
index 5f34140b..00000000
Binary files a/Output/Themes/Ambient/PlayIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PlayerSelector.png b/Output/Themes/Ambient/PlayerSelector.png
deleted file mode 100644
index c57ab300..00000000
Binary files a/Output/Themes/Ambient/PlayerSelector.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Plus.png b/Output/Themes/Ambient/Plus.png
deleted file mode 100644
index 5b813c53..00000000
Binary files a/Output/Themes/Ambient/Plus.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Pointer.png b/Output/Themes/Ambient/Pointer.png
deleted file mode 100644
index 59b46685..00000000
Binary files a/Output/Themes/Ambient/Pointer.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Popup.png b/Output/Themes/Ambient/Popup.png
deleted file mode 100644
index 80868001..00000000
Binary files a/Output/Themes/Ambient/Popup.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PreviousIcon.png b/Output/Themes/Ambient/PreviousIcon.png
deleted file mode 100644
index 9a92bf23..00000000
Binary files a/Output/Themes/Ambient/PreviousIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Random.png b/Output/Themes/Ambient/Random.png
deleted file mode 100644
index b07ecf7b..00000000
Binary files a/Output/Themes/Ambient/Random.png and /dev/null differ
diff --git a/Output/Themes/Ambient/RepeatIcon.png b/Output/Themes/Ambient/RepeatIcon.png
deleted file mode 100644
index ecf82df1..00000000
Binary files a/Output/Themes/Ambient/RepeatIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/Background.pdn b/Output/Themes/Ambient/Resources/Background.pdn
deleted file mode 100644
index a0f5a725..00000000
Binary files a/Output/Themes/Ambient/Resources/Background.pdn and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/Button.pdn b/Output/Themes/Ambient/Resources/Button.pdn
deleted file mode 100644
index 53d2b175..00000000
Binary files a/Output/Themes/Ambient/Resources/Button.pdn and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/Button2.pdn b/Output/Themes/Ambient/Resources/Button2.pdn
deleted file mode 100644
index deeeac16..00000000
Binary files a/Output/Themes/Ambient/Resources/Button2.pdn and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/CoverBackground.xcf b/Output/Themes/Ambient/Resources/CoverBackground.xcf
deleted file mode 100644
index bc8001ef..00000000
Binary files a/Output/Themes/Ambient/Resources/CoverBackground.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/CoverTile.pdn b/Output/Themes/Ambient/Resources/CoverTile.pdn
deleted file mode 100644
index 06d60261..00000000
Binary files a/Output/Themes/Ambient/Resources/CoverTile.pdn and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/EnergyBeam.xcf b/Output/Themes/Ambient/Resources/EnergyBeam.xcf
deleted file mode 100644
index 3ccb0617..00000000
Binary files a/Output/Themes/Ambient/Resources/EnergyBeam.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/LyricHelper.xcf b/Output/Themes/Ambient/Resources/LyricHelper.xcf
deleted file mode 100644
index 81d3cb01..00000000
Binary files a/Output/Themes/Ambient/Resources/LyricHelper.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/Menu.pdn b/Output/Themes/Ambient/Resources/Menu.pdn
deleted file mode 100644
index 9a813632..00000000
Binary files a/Output/Themes/Ambient/Resources/Menu.pdn and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/NextIcon.psd b/Output/Themes/Ambient/Resources/NextIcon.psd
deleted file mode 100644
index a6af8829..00000000
Binary files a/Output/Themes/Ambient/Resources/NextIcon.psd and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/Pause.PSD b/Output/Themes/Ambient/Resources/Pause.PSD
deleted file mode 100644
index ada7ac26..00000000
Binary files a/Output/Themes/Ambient/Resources/Pause.PSD and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/PauseIcon.psd b/Output/Themes/Ambient/Resources/PauseIcon.psd
deleted file mode 100644
index 2046e471..00000000
Binary files a/Output/Themes/Ambient/Resources/PauseIcon.psd and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/PerfectNoteStar.xcf b/Output/Themes/Ambient/Resources/PerfectNoteStar.xcf
deleted file mode 100644
index be5fdc6a..00000000
Binary files a/Output/Themes/Ambient/Resources/PerfectNoteStar.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/PlayIcon.psd b/Output/Themes/Ambient/Resources/PlayIcon.psd
deleted file mode 100644
index ba63fc5c..00000000
Binary files a/Output/Themes/Ambient/Resources/PlayIcon.psd and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/PreviousIcon.psd b/Output/Themes/Ambient/Resources/PreviousIcon.psd
deleted file mode 100644
index 0e5756eb..00000000
Binary files a/Output/Themes/Ambient/Resources/PreviousIcon.psd and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/RepeatIcon.psd b/Output/Themes/Ambient/Resources/RepeatIcon.psd
deleted file mode 100644
index cd1a0637..00000000
Binary files a/Output/Themes/Ambient/Resources/RepeatIcon.psd and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/SelectSlide.pdn b/Output/Themes/Ambient/Resources/SelectSlide.pdn
deleted file mode 100644
index 23f841b0..00000000
Binary files a/Output/Themes/Ambient/Resources/SelectSlide.pdn and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/Snowflake.xcf b/Output/Themes/Ambient/Resources/Snowflake.xcf
deleted file mode 100644
index c6ae1e64..00000000
Binary files a/Output/Themes/Ambient/Resources/Snowflake.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/Star.xcf b/Output/Themes/Ambient/Resources/Star.xcf
deleted file mode 100644
index 04c8ec80..00000000
Binary files a/Output/Themes/Ambient/Resources/Star.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/TimeBar.pdn b/Output/Themes/Ambient/Resources/TimeBar.pdn
deleted file mode 100644
index bdd1dc2e..00000000
Binary files a/Output/Themes/Ambient/Resources/TimeBar.pdn and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/TimeLine.pdn b/Output/Themes/Ambient/Resources/TimeLine.pdn
deleted file mode 100644
index bbddb4be..00000000
Binary files a/Output/Themes/Ambient/Resources/TimeLine.pdn and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/ToneHelper.xcf b/Output/Themes/Ambient/Resources/ToneHelper.xcf
deleted file mode 100644
index 1c828ae6..00000000
Binary files a/Output/Themes/Ambient/Resources/ToneHelper.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/hd_glow-1920x1080.jpg b/Output/Themes/Ambient/Resources/hd_glow-1920x1080.jpg
deleted file mode 100644
index 4baf928b..00000000
Binary files a/Output/Themes/Ambient/Resources/hd_glow-1920x1080.jpg and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/neon-arrow-right-icon-black-250.jpg b/Output/Themes/Ambient/Resources/neon-arrow-right-icon-black-250.jpg
deleted file mode 100644
index 931b2f4c..00000000
Binary files a/Output/Themes/Ambient/Resources/neon-arrow-right-icon-black-250.jpg and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/neon-arrow-up-icon-black-250.jpg b/Output/Themes/Ambient/Resources/neon-arrow-up-icon-black-250.jpg
deleted file mode 100644
index 54adcecf..00000000
Binary files a/Output/Themes/Ambient/Resources/neon-arrow-up-icon-black-250.jpg and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/neon-finger-point-icon-black-250.jpg b/Output/Themes/Ambient/Resources/neon-finger-point-icon-black-250.jpg
deleted file mode 100644
index 40e42f2b..00000000
Binary files a/Output/Themes/Ambient/Resources/neon-finger-point-icon-black-250.jpg and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/neon-microphone-icon-black-250.jpg b/Output/Themes/Ambient/Resources/neon-microphone-icon-black-250.jpg
deleted file mode 100644
index 5b0c3671..00000000
Binary files a/Output/Themes/Ambient/Resources/neon-microphone-icon-black-250.jpg and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/neon-pie-chart-icon-black-250.jpg b/Output/Themes/Ambient/Resources/neon-pie-chart-icon-black-250.jpg
deleted file mode 100644
index 8c542ddd..00000000
Binary files a/Output/Themes/Ambient/Resources/neon-pie-chart-icon-black-250.jpg and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/neon-video-camera-icon-black-250.jpg b/Output/Themes/Ambient/Resources/neon-video-camera-icon-black-250.jpg
deleted file mode 100644
index 0cad5de6..00000000
Binary files a/Output/Themes/Ambient/Resources/neon-video-camera-icon-black-250.jpg and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/notes_bg_left.xcf b/Output/Themes/Ambient/Resources/notes_bg_left.xcf
deleted file mode 100644
index 3c4aacb1..00000000
Binary files a/Output/Themes/Ambient/Resources/notes_bg_left.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/notes_bg_mid.xcf b/Output/Themes/Ambient/Resources/notes_bg_mid.xcf
deleted file mode 100644
index 2977894a..00000000
Binary files a/Output/Themes/Ambient/Resources/notes_bg_mid.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/notes_bg_right.xcf b/Output/Themes/Ambient/Resources/notes_bg_right.xcf
deleted file mode 100644
index a92faa28..00000000
Binary files a/Output/Themes/Ambient/Resources/notes_bg_right.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/notes_left.xcf b/Output/Themes/Ambient/Resources/notes_left.xcf
deleted file mode 100644
index 774ab5a9..00000000
Binary files a/Output/Themes/Ambient/Resources/notes_left.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/notes_mid.xcf b/Output/Themes/Ambient/Resources/notes_mid.xcf
deleted file mode 100644
index a43c73b4..00000000
Binary files a/Output/Themes/Ambient/Resources/notes_mid.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Resources/notes_right.xcf b/Output/Themes/Ambient/Resources/notes_right.xcf
deleted file mode 100644
index 4721c403..00000000
Binary files a/Output/Themes/Ambient/Resources/notes_right.xcf and /dev/null differ
diff --git a/Output/Themes/Ambient/Save.png b/Output/Themes/Ambient/Save.png
deleted file mode 100644
index 1afc3113..00000000
Binary files a/Output/Themes/Ambient/Save.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Score.png b/Output/Themes/Ambient/Score.png
deleted file mode 100644
index 98ac51e3..00000000
Binary files a/Output/Themes/Ambient/Score.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
deleted file mode 100644
index f4300e82..00000000
--- a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-
-
-
- PopupScreenPlayerControl
- 1
-
-
-
-
- Menu
-
-
- 49
- 0
- 1181
- 42
- 0
-
-
-
- CoverBackground
-
-
- 55
- 2
- 38
- 38
- 0
-
-
-
-
-
- 410
- 8
- 0
- 27
- 769
-
-
- Left
- Center
-
- Outline
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml
deleted file mode 100644
index dd0d120f..00000000
--- a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-
-
-
- PopupScreenServerQR
- 1
-
-
-
-
- SongMenuBG
-
- 1
- 1
- 1
- 0.8
-
-
- 0
- 0
- 1280
- 720
- -1.99
-
-
-
- Menu
-
-
- 490
- 210
- 300
- 300
- -2
-
-
-
- Menu
-
-
- 25
- 25
- 200
- 200
- -2
-
-
-
- Menu
-
-
- 1055
- 25
- 200
- 200
- -2
-
-
-
- Menu
-
-
- 25
- 495
- 200
- 200
- -2
-
-
-
- Menu
-
-
- 1055
- 495
- 200
- 200
- -2
-
-
-
-
-
- 640
- 180
- -2
- 35
- 300
-
-
- Center
- Center
-
- Outline
- TR_SCREENPSERVERQR_ADDRESS
-
-
- 125
- 230
- -2
- 27
- 200
-
-
- Center
- Center
-
- Outline
- Android
-
-
- 1155
- 230
- -2
- 27
- 200
-
-
- Center
- Center
-
- Outline
- Symbian
-
-
- 125
- 460
- -2
- 27
- 200
-
-
- Center
- Center
-
- Outline
- WebOS
-
-
- 1155
- 460
- -2
- 27
- 200
-
-
- Center
- Center
-
- Outline
- Windows Phone
-
-
- 640
- 515
- -2
- 35
- 300
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 265
- -2
- 45
- 600
-
-
- Center
- Center
-
- Outline
- TR_SCREENPSERVERQR_NOTRUNNING
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
deleted file mode 100644
index 1ec17015..00000000
--- a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
- PopupScreenVolumeControl
- 1
-
-
-
-
- Menu
-
-
- 1065
- 672
- 225
- 48
- -2
-
-
-
-
-
- 1067
- 682
- -2
- 27
- 80
-
-
- Left
- Center
-
- Outline
- TR_SCREENPVOLUMECONTROL_VOLUME
-
-
-
-
-
-
-
-
- Minus
- Plus
-
- Minus
- Plus
-
- 1070
- 680
- 200
- 30
- -2
-
-
- 1195
- 680
- 30
- 30
- -2
-
-
- 1235
- 680
- 30
- 30
- -2
-
-
-
-
-
-
-
- 27
- 0
- 0
- 25
- Outline
- Bold
- 1
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml
deleted file mode 100644
index 4e997947..00000000
--- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml
+++ /dev/null
@@ -1,795 +0,0 @@
-
-
-
- ScreenHighscore
- 2
-
-
-
- Video
-
-
- BG_Default
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
- TextBG
-
-
- 50
- 90
- 1180
- 610
- 0
-
-
-
-
-
- 60
- 50
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENHIGHSCORE_HIGHSCORE
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 1220
- 50
- 0
- 27
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 103
- 0
- 35
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 160
- 0
- 42
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 223
- 0
- 35
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 283
- 0
- 35
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 343
- 0
- 35
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 403
- 0
- 35
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 463
- 0
- 35
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 523
- 0
- 35
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 583
- 0
- 35
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 120
- 643
- 0
- 35
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 200
- 103
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 200
- 163
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 200
- 223
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 200
- 283
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 200
- 343
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 200
- 403
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 200
- 463
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 200
- 523
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 200
- 583
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 200
- 643
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 103
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 163
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 223
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 283
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 343
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 403
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 463
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 523
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 583
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 800
- 643
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 103
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 163
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 223
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 283
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 343
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 403
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 463
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 523
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 583
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1000
- 643
- 0
- 35
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
-
-
-
-
-
-
-
-
-
-
- Star
-
- 80
- 100
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
- Star
-
- 80
- 160
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
- Star
-
- 80
- 220
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
- Star
-
- 80
- 280
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
- Star
-
- 80
- 340
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
- Star
-
- 80
- 400
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
- Star
-
- 80
- 460
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
- Star
-
- 80
- 520
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
- Star
-
- 80
- 580
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
- Star
-
- 80
- 640
- 1080
- 35
- 1
-
-
- Star
- 25
- 250
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenLoad.xml b/Output/Themes/Ambient/Screens/ScreenLoad.xml
deleted file mode 100644
index 164888a9..00000000
--- a/Output/Themes/Ambient/Screens/ScreenLoad.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
- ScreenLoad
- 2
-
-
-
- Texture
-
-
- BG_Default
-
-
-
-
-
- Menu
-
-
- 50
- 644
- 1195
- 50
- 0
-
-
-
-
-
- 60
- 655
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENLOAD_LOADING
-
-
- 240
- 655
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- Gesamt: 168 Lieder (168 geladen)
-
-
- 640
- 305
- 0
- 101
- 0
-
-
- Center
- Center
-
- Outline
- TR_PROGRAM_NAME
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenMain.xml b/Output/Themes/Ambient/Screens/ScreenMain.xml
deleted file mode 100644
index a6f426e7..00000000
--- a/Output/Themes/Ambient/Screens/ScreenMain.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
-
- ScreenMain
- 2
-
-
-
- Video
-
-
- BG_Default
-
-
-
-
-
- Menu
-
-
- 49
- 32
- 1181
- 50
- 0
-
-
-
- TextBG
-
-
- 150
- 610
- 355
- 30
- -1.9
-
-
-
-
-
- 10
- 690
- -1
- 15
- 0
-
-
- Left
- Center
-
- Normal
- Vocaluxe "Shining Heaven" v0.3.0 (x64) Beta (0083)
-
-
- 320
- 612
- -2
- 27
- 355
-
-
- Center
- Center
-
- Outline
- TR_SCREENMAIN_TEXT_NOPROFILES
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml
deleted file mode 100644
index 24cac2dd..00000000
--- a/Output/Themes/Ambient/Screens/ScreenNames.xml
+++ /dev/null
@@ -1,817 +0,0 @@
-
-
-
- ScreenNames
- 3
-
-
-
- Video
-
-
- BG_Options
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
-
-
-
- 20
- 105
- 108
- 108
- -3
-
-
-
-
-
-
- 20
- 260
- 108
- 108
- -3
-
-
-
-
-
-
- 20
- 415
- 108
- 108
- -3
-
-
-
-
-
-
- 1152
- 105
- 108
- 108
- -3
-
-
-
-
-
-
- 1152
- 260
- 108
- 108
- -3
-
-
-
-
-
-
- 1152
- 415
- 108
- 108
- -3
-
-
-
- PlayerSelector
-
-
- 15
- 100
- 118
- 118
- -2
-
-
-
- PlayerSelector
-
-
- 15
- 255
- 118
- 118
- -2
-
-
-
- PlayerSelector
-
-
- 15
- 410
- 118
- 118
- -2
-
-
-
- PlayerSelector
-
-
- 1147
- 100
- 118
- 118
- -2
-
-
-
- PlayerSelector
-
-
- 1147
- 255
- 118
- 118
- -2
-
-
-
- PlayerSelector
-
-
- 1147
- 410
- 118
- 118
- -2
-
-
-
-
-
-
- 300
- 603
- 685
- 50
- -1
-
-
-
-
-
-
- 300
- 654
- 685
- 50
- -1
-
-
-
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENNAMES_MENU
-
-
- 640
- 617
- -1.1
- 27
- 970
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 652
- -1.1
- 27
- 970
-
-
- Center
- Center
-
- Outline
-
-
-
- 74
- 219
- 0
- 20
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 74
- 374
- 0
- 20
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 74
- 529
- 0
- 20
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 1206
- 219
- 0
- 20
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 1206
- 374
- 0
- 20
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 1206
- 529
- 0
- 20
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
-
-
-
-
-
-
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlidePlayer
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 70
- 548
- 1140
- 45
- 0
-
-
- 75
- 553
- 40
- 40
- 0
-
-
- 1170
- 553
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 186
- Outline
- Bold
- 6
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 41
- 105
- 88
- 20
- -4
-
-
- 20
- 105
- 20
- 20
- -4.01
-
-
- 20
- 105
- 20
- 20
- -4.01
-
-
-
-
-
-
-
- 20
- 50
- 0
- 86
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 41
- 260
- 88
- 20
- -4
-
-
- 20
- 260
- 20
- 20
- -4.01
-
-
- 20
- 260
- 20
- 20
- -4.01
-
-
-
-
-
-
-
- 20
- 50
- 0
- 86
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 41
- 415
- 88
- 20
- -4
-
-
- 20
- 415
- 20
- 20
- -4.01
-
-
- 20
- 415
- 20
- 20
- -4.01
-
-
-
-
-
-
-
- 20
- 50
- 0
- 86
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 1152
- 105
- 88
- 20
- -4
-
-
- 1240
- 105
- 20
- 20
- -4.01
-
-
- 1240
- 105
- 20
- 20
- -4.01
-
-
-
-
-
-
-
- 20
- 50
- 0
- 86
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 1152
- 260
- 88
- 20
- -4
-
-
- 1240
- 260
- 20
- 20
- -4.01
-
-
- 1240
- 260
- 20
- 20
- -4.01
-
-
-
-
-
-
-
- 20
- 50
- 0
- 86
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 1152
- 415
- 88
- 20
- -4
-
-
- 1240
- 415
- 20
- 20
- -4.01
-
-
- 1240
- 415
- 20
- 20
- -4.01
-
-
-
-
-
-
-
- 20
- 50
- 0
- 86
- Outline
- Bold
- 1
-
-
-
-
-
-
- 172
- 127
- 945
- 393
- 0
-
- CoverTile
-
- 1
- 1
- 1
- 0.2
-
- PlayerSelector
-
- 100
- 100
- 8
- 3
- 20.71
- 30
-
- 2
- 17
- Outline
-
-
-
-
-
-
-
-
-
-
- 21
- 152
- 108
- 60
- -4
-
- 8
- 2
-
- TR_CONFIG_OFF
- 0.4
- 0.4
-
-
-
-
- 21
- 307
- 108
- 60
- -4
-
- 8
- 2
-
- TR_CONFIG_OFF
- 0.4
- 0.4
-
-
-
-
- 21
- 467
- 108
- 60
- -4
-
- 8
- 2
-
- TR_CONFIG_OFF
- 0.4
- 0.4
-
-
-
-
- 1153
- 152
- 108
- 60
- -4
-
- 8
- 2
-
- TR_CONFIG_OFF
- 0.4
- 0.4
-
-
-
-
- 1153
- 307
- 108
- 60
- -4
-
- 8
- 2
-
- TR_CONFIG_OFF
- 0.4
- 0.4
-
-
-
-
- 1153
- 467
- 108
- 60
- -4
-
- 8
- 2
-
- TR_CONFIG_OFF
- 0.4
- 0.4
-
-
-
-
-
-
diff --git a/Output/Themes/Ambient/Screens/ScreenOptions.xml b/Output/Themes/Ambient/Screens/ScreenOptions.xml
deleted file mode 100644
index 76ca27d0..00000000
--- a/Output/Themes/Ambient/Screens/ScreenOptions.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-
-
-
- ScreenOptions
- 1
-
-
-
- Video
-
-
- BG_Default
-
-
-
-
-
- Menu
-
-
- 50
- 32
- 1180
- 50
- 0
-
-
-
-
-
- 60
- 43
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENO_OPTIONS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
deleted file mode 100644
index 5b3b6ec4..00000000
--- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+++ /dev/null
@@ -1,529 +0,0 @@
-
-
-
- ScreenOptionsGame
- 2
-
-
-
- Video
-
-
- BG_Options
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
-
-
-
- 50
- 100
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 160
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 220
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 280
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 340
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 400
- 460
- 50
- 0
-
-
-
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENOGAME_OPTIONS
-
-
- 75
- 107
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOGAME_LANGUAGE
-
-
- 75
- 167
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOGAME_DEBUGLEVEL
-
-
- 75
- 227
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOGAME_SONGMENU
-
-
- 75
- 287
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOGAME_SONGSORTING
-
-
- 75
- 347
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOGAME_TABS
-
-
- 75
- 407
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOGAME_TIMERMODE
-
-
-
-
-
-
-
-
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 100
- 700
- 50
- 0
-
-
- 505
- 105
- 40
- 40
- 0
-
-
- 1170
- 105
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 160
- 700
- 50
- 0
-
-
- 505
- 165
- 40
- 40
- 0
-
-
- 1170
- 165
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 220
- 700
- 50
- 0
-
-
- 505
- 225
- 40
- 40
- 0
-
-
- 1170
- 225
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 280
- 700
- 50
- 0
-
-
- 505
- 285
- 40
- 40
- 0
-
-
- 1170
- 285
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 340
- 700
- 50
- 0
-
-
- 505
- 345
- 40
- 40
- 0
-
-
- 1170
- 345
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 308
- Outline
- Bold
- 2
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 400
- 700
- 50
- 0
-
-
- 505
- 405
- 40
- 40
- 0
-
-
- 1170
- 405
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
-
-
-
-
-
-
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
deleted file mode 100644
index ea8f4344..00000000
--- a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-
-
-
- ScreenOptionsLyrics
- 2
-
-
-
- Video
-
-
- BG_Options
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENOLYRICS_OPTIONS
-
-
- 75
- 107
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOLYRICS_STYLE
-
-
- 75
- 167
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOLYRICS_POSITION
-
-
-
-
-
-
-
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 100
- 700
- 50
- 0
-
-
- 505
- 105
- 40
- 40
- 0
-
-
- 1170
- 105
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 4
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 160
- 700
- 50
- 0
-
-
- 505
- 165
- 40
- 40
- 0
-
-
- 1170
- 165
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 2
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
deleted file mode 100644
index 95b8464d..00000000
--- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+++ /dev/null
@@ -1,522 +0,0 @@
-
-
-
- ScreenOptionsRecord
- 4
-
-
-
- Video
-
-
- BG_Options
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
-
-
-
- 50
- 100
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 160
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 220
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 280
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 340
- 460
- 50
- 0
-
-
-
-
-
-
- 145
- 530
- 990
- 50
- 0
-
-
-
- EnergyBeam
-
-
- 390
- 234
- 100
- 16
- 0
-
-
-
- EnergyBeam
-
-
- 390
- 296
- 100
- 16
- 0
-
-
-
-
-
- 640
- 55
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENORECORD_OPTIONS
-
-
- 75
- 106
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENORECORD_DEVICE
-
-
- 75
- 347
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENORECORD_MIC_DELAY
-
-
- 640
- 537
- 0
- 27
- 970
-
-
- Center
- Center
-
- Outline
- TR_SCREENORECORD_MIC_WARNING
-
-
- 75
- 227
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENORECORD_CHANNEL_1
-
-
- 75
- 287
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENORECORD_CHANNEL_2
-
-
- 330
- 227
- -1
- 27
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
- 330
- 287
- -1
- 27
- 0
-
-
- Right
- Center
-
- Outline
-
-
-
-
-
-
-
-
-
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 100
- 700
- 50
- 0
-
-
- 505
- 105
- 40
- 40
- 0
-
-
- 1170
- 105
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 616
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 220
- 700
- 50
- 0
-
-
- 505
- 225
- 40
- 40
- 0
-
-
- 1170
- 225
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 154
- Outline
- Bold
- 7
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 280
- 700
- 50
- 0
-
-
- 505
- 285
- 40
- 40
- 0
-
-
- 1170
- 285
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 154
- Outline
- Bold
- 7
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 340
- 700
- 50
- 0
-
-
- 505
- 345
- 40
- 40
- 0
-
-
- 1170
- 345
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 123.2
- Outline
- Bold
- 5
-
-
-
-
-
-
-
-
- 50
- 400
- 230
- 150
- -1
-
- 12
- 2
-
- TR_CONFIG_OFF
-
-
-
- 26
- 10
-
-
-
-
-
- 400
- 400
- 230
- 150
- -1
-
- 12
- 2
-
- TR_CONFIG_OFF
-
-
-
- 26
- 10
-
-
-
-
-
-
-
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
deleted file mode 100644
index 9b7e88c6..00000000
--- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+++ /dev/null
@@ -1,372 +0,0 @@
-
-
-
- ScreenOptionsSound
- 3
-
-
-
- Video
-
-
- BG_Options
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENOSOUND_OPTIONS
-
-
- 75
- 107
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOSOUND_BACKGROUNDMUSIC
-
-
- 75
- 167
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME
-
-
- 75
- 227
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE
-
-
- 75
- 287
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOSOUND_PREVIEWMUSICVOLUME
-
-
- 75
- 347
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOSOUND_GAMEMUSICVOLUME
-
-
-
-
-
-
-
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 100
- 700
- 50
- 0
-
-
- 505
- 105
- 40
- 40
- 0
-
-
- 1170
- 105
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 160
- 700
- 50
- 0
-
-
- 505
- 165
- 40
- 40
- 0
-
-
- 1170
- 165
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 220
- 700
- 50
- 0
-
-
- 505
- 225
- 40
- 40
- 0
-
-
- 1170
- 225
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 500
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 280
- 700
- 50
- 0
-
-
- 505
- 285
- 40
- 40
- 0
-
-
- 1170
- 285
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 500
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 340
- 700
- 50
- 0
-
-
- 505
- 345
- 40
- 40
- 0
-
-
- 1170
- 345
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 500
- Outline
- Bold
- 3
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
deleted file mode 100644
index 61ed39bb..00000000
--- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
+++ /dev/null
@@ -1,628 +0,0 @@
-
-
-
- ScreenOptionsTheme
- 3
-
-
-
- Video
-
-
- BG_Options
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
-
-
-
- 50
- 100
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 160
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 220
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 280
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 340
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 400
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 460
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 520
- 460
- 50
- 0
-
-
-
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENOTHEME_OPTIONS
-
-
- 75
- 107
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOTHEME_THEME
-
-
- 75
- 167
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOTHEME_SKIN
-
-
- 75
- 227
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOTHEME_COVERTHEME
-
-
- 75
- 287
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOTHEME_NOTELINES
-
-
- 75
- 347
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOTHEME_TONEHELPER
-
-
- 75
- 407
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOTHEME_TIMERLOOK
-
-
- 75
- 467
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOTHEME_FADEINFO
-
-
- 75
- 527
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOTHEME_COVERLOADING
-
-
-
-
-
-
-
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 100
- 700
- 50
- 0
-
-
- 505
- 105
- 40
- 40
- 0
-
-
- 1170
- 105
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 616
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 160
- 700
- 50
- 0
-
-
- 505
- 165
- 40
- 40
- 0
-
-
- 1170
- 165
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 616
- Outline
- Bold
- 1
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 220
- 700
- 50
- 0
-
-
- 505
- 225
- 40
- 40
- 0
-
-
- 1170
- 225
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 308
- Outline
- Bold
- 2
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 280
- 700
- 50
- 0
-
-
- 505
- 285
- 40
- 40
- 0
-
-
- 1170
- 285
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 308
- Outline
- Bold
- 2
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 340
- 700
- 50
- 0
-
-
- 505
- 345
- 40
- 40
- 0
-
-
- 1170
- 345
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 308
- Outline
- Bold
- 2
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 400
- 700
- 50
- 0
-
-
- 505
- 405
- 40
- 40
- 0
-
-
- 1170
- 405
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 308
- Outline
- Bold
- 2
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 460
- 700
- 50
- 0
-
-
- 505
- 465
- 40
- 40
- 0
-
-
- 1170
- 465
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 616
- Outline
- Bold
- 2
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 520
- 700
- 50
- 0
-
-
- 505
- 525
- 40
- 40
- 0
-
-
- 1170
- 525
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 616
- Outline
- Bold
- 1
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
deleted file mode 100644
index 06a05c7b..00000000
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+++ /dev/null
@@ -1,507 +0,0 @@
-
-
-
- ScreenOptionsVideo
- 5
-
-
-
- Video
-
-
- BG_Options
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
-
-
-
- 50
- 100
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 160
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 220
- 460
- 50
- 0
-
-
-
-
-
-
- 550
- 460
- 320
- 240
- 0
-
-
-
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENOVIDEO_OPTIONS
-
-
- 75
- 107
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOVIDEO_VIDEOBACKGROUNDS
-
-
- 75
- 167
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOVIDEO_VIDEOPREVIEW
-
-
- 75
- 227
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOVIDEO_VIDEOINSONGS
-
-
- 75
- 287
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOVIDEO_VIDEOSTOBACKGROUND
-
-
- 75
- 347
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOVIDEO_WEBCAMDEVICES
-
-
- 75
- 407
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOVIDEO_WEBCAMRESOLUTION
-
-
-
-
-
-
-
-
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 100
- 700
- 50
- 0
-
-
- 505
- 105
- 40
- 40
- 0
-
-
- 1170
- 105
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 160
- 700
- 50
- 0
-
-
- 505
- 165
- 40
- 40
- 0
-
-
- 1170
- 165
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 220
- 700
- 50
- 0
-
-
- 505
- 225
- 40
- 40
- 0
-
-
- 1170
- 225
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 280
- 700
- 50
- 0
-
-
- 505
- 285
- 40
- 40
- 0
-
-
- 1170
- 285
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 340
- 700
- 50
- 0
-
-
- 505
- 345
- 40
- 40
- 0
-
-
- 1170
- 345
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 205.33
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 400
- 700
- 50
- 0
-
-
- 505
- 405
- 40
- 40
- 0
-
-
- 1170
- 405
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 150
- Outline
- Bold
- 3
-
-
-
-
-
-
-
-
-
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
deleted file mode 100644
index 28b6f26d..00000000
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
- ScreenOptionsVideoAdjustments
- 1
-
-
-
- Color
-
-
- BG_Options
-
- 1
- 1
- 1
- 1
-
-
-
-
-
-
- 0
- 0
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT
-
-
- 1280
- 0
- 0
- 27
- 0
-
-
- Right
- Center
-
- Outline
- TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT
-
-
- 0
- 693
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT
-
-
- 1280
- 693
- 0
- 27
- 0
-
-
- Right
- Center
-
- Outline
- TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT
-
-
- 640
- 320
- 0
- 35
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENOVIDEOADJUSTMENTS_NOTES
-
-
- 640
- 360
- 0
- 35
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml
deleted file mode 100644
index 3dec51bd..00000000
--- a/Output/Themes/Ambient/Screens/ScreenParty.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-
-
-
- ScreenParty
- 1
-
-
-
- Video
-
-
- BG_Default
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENPARTY_TITLE
-
-
- 75
- 107
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPARTY_MODES
-
-
- 75
- 167
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPARTY_DESCRIPTION
-
-
- 75
- 227
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPARTY_TARGETAUDIENCE
-
-
- 75
- 287
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPARTY_NUMTEAMS
-
-
- 75
- 347
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPARTY_NUMPLAYERS
-
-
- 75
- 407
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPARTY_AUTHOR
-
-
- 75
- 467
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPARTY_VERSION
-
-
- 850
- 167
- 0
- 27
- 600
-
-
- Center
- Center
-
- Outline
-
-
-
- 850
- 227
- 0
- 27
- 600
-
-
- Center
- Center
-
- Outline
-
-
-
- 850
- 287
- 0
- 27
- 600
-
-
- Center
- Center
-
- Outline
-
-
-
- 850
- 347
- 0
- 27
- 600
-
-
- Center
- Center
-
- Outline
-
-
-
- 850
- 407
- 0
- 27
- 600
-
-
- Center
- Center
-
- Outline
-
-
-
- 850
- 467
- 0
- 27
- 600
-
-
- Center
- Center
-
- Outline
-
-
-
- 850
- 527
- 0
- 27
- 600
-
-
- Center
- Center
-
- Outline
- TR_SCREENPARTY_ERROR
-
-
-
-
-
-
-
-
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 100
- 700
- 50
- 0
-
-
- 505
- 105
- 40
- 40
- 0
-
-
- 1170
- 105
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 600
- Outline
- Bold
- 1
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
deleted file mode 100644
index c612e90e..00000000
--- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml
+++ /dev/null
@@ -1,694 +0,0 @@
-
-
-
- ScreenProfiles
- 3
-
-
-
- Video
-
-
- BG_Options
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
-
-
-
- 50
- 160
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 220
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 280
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 340
- 460
- 50
- 0
-
-
-
-
-
-
- 50
- 400
- 460
- 50
- 0
-
-
-
-
-
-
- 85
- 110
- 160
- 160
- 0
-
-
-
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
- TR_SCREENPROFILES_PROFILES
-
-
- 75
- 287
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPROFILES_PLAYERNAME
-
-
- 75
- 347
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPROFILES_GAMEDIFFICULTY
-
-
- 75
- 407
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPROFILES_AVATAR
-
-
- 75
- 467
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPROFILES_USERROLE
-
-
- 75
- 527
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENPROFILES_ACTIVE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 160
- 710
- 50
- 0
-
-
- 505
- 165
- 40
- 40
- 0
-
-
- 1170
- 165
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 219.2
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 340
- 710
- 50
- 0
-
-
- 505
- 345
- 40
- 40
- 0
-
-
- 1170
- 345
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 208.67
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 400
- 710
- 50
- 0
-
-
- 505
- 405
- 40
- 40
- 0
-
-
- 1170
- 405
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 208.67
- Outline
- Bold
- 3
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 460
- 710
- 50
- 0
-
-
- 505
- 465
- 40
- 40
- 0
-
-
- 1170
- 465
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 313
- Outline
- Bold
- 2
-
-
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 500
- 520
- 710
- 50
- 0
-
-
- 505
- 525
- 40
- 40
- 0
-
-
- 1170
- 525
- 40
- 40
- 0
-
-
-
-
-
-
-
- 27
- 50
- 0
- 313
- Outline
- Bold
- 2
-
-
-
-
-
-
-
-
-
diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml
deleted file mode 100644
index fec36f43..00000000
--- a/Output/Themes/Ambient/Screens/ScreenScore.xml
+++ /dev/null
@@ -1,2160 +0,0 @@
-
-
-
- ScreenScore
- 3
-
-
-
- Video
-
-
- BG_Default
-
-
-
-
-
- Menu
-
-
- 40
- 40
- 1200
- 50
- 0
-
-
-
- TextBG
-
- 0
- 0
- 0
- 0
-
-
- 50
- 90
- 1180
- 610
- 0
-
-
-
- PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
-
- 560
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 560
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 560
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
-
- 352
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 352
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 352
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
-
- 768
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 768
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 768
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
-
- 238
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 238
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 238
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
-
- 560
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 560
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 560
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0
- 1
- 0
- 0.75
-
-
- 882
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 882
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 882
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
-
- 190
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 190
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 190
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
-
- 422
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 422
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 422
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0
- 1
- 0
- 0.75
-
-
- 654
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 654
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 654
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0.5
- 0
- 1
- 0.75
-
-
- 886
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 886
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 886
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
-
- 144
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 144
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 144
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
-
- 352
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 352
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 352
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0
- 1
- 0
- 0.75
-
-
- 560
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 560
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 560
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0.5
- 0
- 1
- 0.75
-
-
- 768
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 768
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 768
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 1
- 0.8
- 0
- 0.75
-
-
- 976
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 976
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 976
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
-
- 45
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 45
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 45
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
-
- 253
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 253
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 253
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0
- 1
- 0
- 0.75
-
-
- 461
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 461
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 461
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 0.5
- 0
- 1
- 0.75
-
-
- 669
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 669
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 669
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 1
- 0.8
- 0
- 0.75
-
-
- 877
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 877
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 877
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
- PointsBarBG
-
- 1
- 0
- 0.5
- 0.75
-
-
- 1085
- 180
- 160
- 220
- 0
-
-
-
- PointsBar
-
-
- 1085
- 180
- 160
- 0
- 0
-
-
-
-
-
-
- 1085
- 410
- 160
- 160
- 0
-
-
- 40
- 15
-
-
-
-
-
- 60
- 50
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
- TR_SCREENSCORE_SCORES
-
-
- 640
- 50
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 107
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 432
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 432
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 432
- 107
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 432
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 848
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 848
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 848
- 107
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 858
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 318
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 318
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 318
- 107
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 318
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 107
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 962
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 962
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 962
- 107
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 962
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 270
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 270
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 270
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 270
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 502
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 502
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 502
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 502
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 734
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 734
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 734
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 734
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 966
- 630
- 0
- 44
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 966
- 142
- 0
- 27
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 966
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 966
- 670
- 0
- 28
- 0
-
-
- Center
- Center
-
- Outline
-
-
-
- 224
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 224
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 224
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 224
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 432
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 432
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 432
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 432
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 640
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 848
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 848
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 848
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 848
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 1056
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 1056
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 1056
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 1056
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 125
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 125
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 125
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 125
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 333
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 333
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 333
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 333
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 541
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 541
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 541
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 541
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 749
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 749
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 749
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 749
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 957
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 957
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 957
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 957
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 1165
- 630
- 0
- 44
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 1165
- 142
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 1165
- 107
- 0
- 27
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
- 1165
- 670
- 0
- 28
- 160
-
-
- Center
- Center
-
- Outline
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 7
- Int
-
-
- 4
- Int
-
-
- 4
- Int
-
-
- Horizontal
- String
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml
deleted file mode 100644
index ed9bcb15..00000000
--- a/Output/Themes/Ambient/Screens/ScreenSing.xml
+++ /dev/null
@@ -1,1903 +0,0 @@
-
-
-
- ScreenSing
- 7
-
-
-
- None
-
-
-
-
- 0
- 0
- 0
- 1
-
-
-
-
-
- Score
-
-
- 190
- 10
- 900
- 50
- -1
-
-
-
- Lyrics
-
-
- 40
- 600
- 1200
- 90
- -0.75
-
-
-
- Lyrics
-
-
- 40
- 7
- 1200
- 93
- -0.75
-
-
-
- Lyrics
-
-
- 40
- 7
- 1200
- 93
- -0.75
-
-
-
- TimeBar
-
-
- 40
- 696
- 1200
- 21
- -0.75
-
-
-
- TimeLine
-
-
- 50
- 702
- 1090
- 10
- -1
-
-
-
- TimeLine
-
-
- 50
- 696
- 1090
- 9
- -1
-
-
-
- TimeLine
-
-
- 50
- 696
- 1090
- 9
- -1
-
-
-
- Pointer
-
- 0
- 0
- 0
- 1
-
-
- 44
- 702
- 2
- 10
- -1.25
-
-
-
- LyricHelper
-
-
- 40
- 600
- 45
- 45
- -1
-
-
-
- LyricHelper
-
-
- 40
- 12
- 45
- 45
- -1
-
-
-
- LyricHelper
-
-
- 40
- 12
- 45
- 45
- -1
-
-
-
- PauseBG
-
-
- 0
- 0
- 1280
- 720
- -2.1
-
-
-
-
-
-
- 1150
- 350
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 360
- 190
- 190
- -0.75
-
-
-
-
-
-
- 1150
- 150
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 160
- 165
- 165
- -0.75
-
-
-
-
-
-
- 1150
- 350
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 360
- 165
- 165
- -0.75
-
-
-
-
-
-
- 1150
- 10
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 111
- 140
- 140
- -0.75
-
-
-
-
-
-
- 1150
- 210
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 274
- 140
- 140
- -0.75
-
-
-
-
-
-
- 1150
- 410
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 442
- 140
- 140
- -0.75
-
-
-
-
-
-
- 528
- 150
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 160
- 165
- 165
- -0.75
-
-
-
-
-
-
- 528
- 350
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 360
- 165
- 165
- -0.75
-
-
-
-
-
-
- 1150
- 150
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 1103
- 160
- 165
- 165
- -0.75
-
-
-
-
-
-
- 1150
- 350
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 1103
- 360
- 165
- 165
- -0.75
-
-
-
-
-
-
- 528
- 10
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 111
- 140
- 140
- -0.75
-
-
-
-
-
-
- 528
- 210
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 274
- 140
- 140
- -0.75
-
-
-
-
-
-
- 528
- 410
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 442
- 140
- 140
- -0.75
-
-
-
-
-
-
- 1150
- 150
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 1103
- 160
- 165
- 165
- -0.75
-
-
-
-
-
-
- 1150
- 350
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 1103
- 360
- 165
- 165
- -0.75
-
-
-
-
-
-
- 528
- 10
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 111
- 140
- 140
- -0.75
-
-
-
-
-
-
- 528
- 210
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 274
- 140
- 140
- -0.75
-
-
-
-
-
-
- 528
- 410
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 40
- 442
- 140
- 140
- -0.75
-
-
-
-
-
-
- 1150
- 10
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 1103
- 111
- 140
- 140
- -0.75
-
-
-
-
-
-
- 1150
- 210
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 1103
- 274
- 140
- 140
- -0.75
-
-
-
-
-
-
- 1150
- 410
- 100
- 50
- -0.75
-
-
-
-
-
- 1
- 1
- 1
- 0.4
-
-
- 1103
- 442
- 140
- 140
- -0.75
-
-
-
-
-
- 640
- 20
- -2
- 27
- 880
-
-
- Center
- Center
-
- Normal
-
-
-
- 1214
- 697
- -1
- 20
- 0
-
-
- Right
- Center
-
- Normal
-
-
-
- 640
- 170
- -2.11
- 90
- 0
-
-
- Center
- Center
-
- Normal
- TR_SCREENSING_PAUSE
-
-
- 40
- 80
- -1
- 30
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 40
- 585
- -1
- 30
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 640
- 20
- -1
- 27
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 1240
- 355
- -1
- 198
- 0
- 0.4
-
- Right
- Center
-
- Normal
-
-
-
- 110
- 513
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 1240
- 155
- -1
- 173
- 0
- 0.4
-
- Right
- Center
-
- Normal
-
-
-
- 110
- 288
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 1240
- 355
- -1
- 173
- 0
- 0.4
-
- Right
- Center
-
- Normal
-
-
-
- 110
- 488
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 1240
- 106
- -1
- 148
- 0
- 0.4
-
- Right
- Center
-
- Normal
-
-
-
- 110
- 219
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 1240
- 269
- -1
- 148
- 0
- 0.4
-
- Right
- Center
-
- Normal
-
-
-
- 110
- 382
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 1240
- 437
- -1
- 148
- 0
- 0.4
-
- Right
- Center
-
- Normal
-
-
-
- 110
- 550
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 324
- 155
- -1
- 173
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 110
- 288
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 324
- 355
- -1
- 173
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 110
- 488
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 967
- 155
- -1
- 173
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 1173
- 288
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 967
- 355
- -1
- 173
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 1173
- 488
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 324
- 106
- -1
- 148
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 110
- 219
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 324
- 269
- -1
- 148
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 110
- 382
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 324
- 437
- -1
- 148
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 110
- 550
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 967
- 155
- -1
- 173
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 1173
- 288
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 967
- 355
- -1
- 173
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 1173
- 488
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 324
- 106
- -1
- 148
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 110
- 219
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 324
- 269
- -1
- 148
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 110
- 382
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 324
- 437
- -1
- 148
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 110
- 550
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 967
- 106
- -1
- 148
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 1173
- 219
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 967
- 269
- -1
- 148
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 1173
- 382
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
- 967
- 437
- -1
- 148
- 0
- 0.4
-
- Center
- Center
-
- Normal
-
-
-
- 1173
- 550
- -1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
-
- Center
- Center
-
- Outline
-
-
-
-
-
-
-
-
-
-
-
-
- 637
- 600
- 1200
- 42
- -1
-
-
-
-
-
-
- 637
- 642
- 1200
- 38
- -1
-
-
-
-
-
-
- 637
- 12
- 1200
- 42
- -1
-
-
-
-
-
-
- 637
- 54
- 1200
- 38
- -1
-
-
-
-
-
-
- 637
- 12
- 1200
- 42
- -1
-
-
-
-
-
-
- 637
- 54
- 1200
- 38
- -1
-
-
-
-
-
-
-
-
- NoteLeft
- NoteMiddle
- NoteRight
- NoteBackgroundLeft
- NoteBackgroundMiddle
- NoteBackgroundRight
- Star
- ToneHelper
- PerfectNoteStar
-
-
-
- 35
- 350
- 1210
- 200
- -1.5
-
-
-
-
- 35
- 150
- 1210
- 175
- -1.5
-
-
-
-
- 35
- 350
- 1210
- 175
- -1.5
-
-
-
-
- 35
- 105
- 1210
- 150
- -1.5
-
-
-
-
- 35
- 268
- 1210
- 150
- -1.5
-
-
-
-
- 35
- 436
- 1210
- 150
- -1.5
-
-
-
-
- 35
- 150
- 578
- 175
- -1.5
-
-
-
-
- 35
- 350
- 578
- 175
- -1.5
-
-
-
-
- 678
- 150
- 578
- 175
- -1.5
-
-
-
-
- 678
- 350
- 578
- 175
- -1.5
-
-
-
-
- 35
- 105
- 578
- 150
- -1.5
-
-
-
-
- 35
- 268
- 578
- 150
- -1.5
-
-
-
-
- 35
- 436
- 578
- 150
- -1.5
-
-
-
-
- 678
- 150
- 578
- 175
- -1.5
-
-
-
-
- 678
- 350
- 578
- 175
- -1.5
-
-
-
-
- 35
- 105
- 578
- 150
- -1.5
-
-
-
-
- 35
- 268
- 578
- 150
- -1.5
-
-
-
-
- 35
- 436
- 578
- 150
- -1.5
-
-
-
-
- 678
- 105
- 578
- 150
- -1.5
-
-
-
-
- 678
- 268
- 578
- 150
- -1.5
-
-
-
-
- 678
- 436
- 578
- 150
- -1.5
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml
deleted file mode 100644
index 62dba236..00000000
--- a/Output/Themes/Ambient/Screens/ScreenSong.xml
+++ /dev/null
@@ -1,1280 +0,0 @@
-
-
-
- ScreenSong
- 5
-
-
-
- Video
-
-
- BG_Default
-
-
-
-
-
- SongMenu
-
-
- 40
- 600
- 1200
- 50
- 0
-
-
- 26
- 10
-
-
-
- Menu
-
-
- 40
- 600
- 1200
- 50
- 0
-
-
- 26
- 10
-
-
-
- SongMenuBG
-
-
- 40
- 40
- 360
- 360
- -2.1
-
-
-
-
-
- 1070
- 65
- -2.11
- 42
- 350
-
-
- Left
- Center
-
- Outline
-
-
-
- 1070
- 135
- -2.11
- 42
- 350
-
-
- Left
- Center
-
- Outline
-
-
-
- 1070
- 205
- -2.11
- 42
- 350
-
-
- Left
- Center
-
- Outline
-
-
-
- 1070
- 275
- -2.11
- 42
- 350
-
-
- Left
- Center
-
- Outline
-
-
-
- 1070
- 345
- -2.11
- 42
- 350
-
-
- Left
- Center
-
- Outline
-
-
-
- 1070
- 415
- -2.11
- 42
- 350
-
-
- Left
- Center
-
- Outline
-
-
-
- 220
- 612
- 0
- 27
- 340
-
-
- Center
- Center
-
- Outline
-
-
- 26
- 24
-
-
-
- 825
- 612
- 0
- 27
- 830
-
-
- Center
- Center
-
- Outline
-
-
- 26
- 24
-
-
-
- 400
- 612
- 0
- 27
- 0
-
-
- Right
- Center
-
- Outline
- TR_SCREENSONG_SEARCH
-
-
- 410
- 612
- 0
- 27
- 0
-
-
- Left
- Center
-
- Outline
-
-
-
- 220
- 47
- -2.11
- 34
- 350
-
-
- Center
- Center
-
- Outline
- TR_SCREENSONG_SONGOPTIONS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CoverTile
- CoverBackground
- DuetIcon
- VideoIcon
- MedleyCalcIcon
- MedleyTagIcon
-
- 1
- 1
- 1
- 0.2
-
-
- 6
- 4
- 4
- 4
- 10
- 10
-
- 410
- 40
- 830
- 550
- -1
-
-
- 410
- 40
- 550
- 550
- -1
-
-
- 222
- 416
- -1.01
- 39
- 340
-
-
- Center
- Top
-
- Outline
-
-
-
- 222
- 456
- -1.01
- 32
- 340
-
-
- Center
- Top
-
- Outline
-
-
-
- 222
- 490
- -1.01
- 28
- 340
-
-
- Center
- Top
-
- Outline
-
-
-
- CoverBackground
-
-
- 40
- 40
- 360
- 360
- -1
-
-
-
- CoverBackground
-
-
- 40
- 40
- 360
- 550
- -1
-
-
-
- DuetIcon
-
-
- 200
- 530
- 40
- 40
- -1
-
-
-
- VideoIcon
-
-
- 120
- 530
- 40
- 40
- -1
-
-
-
- MedleyCalcIcon
-
-
- 280
- 530
- 40
- 40
- -1
-
-
-
- MedleyTagIcon
-
-
- 280
- 530
- 40
- 40
- -1
-
-
-
-
-
-
-
-
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 40
- 135
- 360
- 40
- -2.11
-
-
- 45
- 140
- 30
- 30
- -2.12
-
-
- 365
- 140
- 30
- 30
- -2.12
-
-
-
-
-
-
-
- 25
- 50
- 0
- 280
- Outline
- Bold
- 1
-
-
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 40
- 190
- 360
- 40
- -2.11
-
-
- 45
- 195
- 30
- 30
- -2.12
-
-
- 365
- 195
- 30
- 30
- -2.12
-
-
-
-
-
-
-
- 25
- 50
- 0
- 280
- Outline
- Bold
- 1
-
-
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 40
- 180
- 360
- 40
- -2.11
-
-
- 45
- 190
- 30
- 30
- -2.12
-
-
- 365
- 190
- 30
- 30
- -2.12
-
-
-
-
-
-
-
- 25
- 50
- 0
- 280
- Outline
- Bold
- 1
-
-
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
- SelectSlide
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 40
- 90
- 360
- 40
- -2.11
-
-
- 45
- 100
- 30
- 30
- -2.12
-
-
- 365
- 100
- 30
- 30
- -2.12
-
-
-
-
-
-
-
- 25
- 50
- 0
- 280
- Outline
- Bold
- 3
-
-
-
-
-
-
-
-
- 970
- 80
- 295
- 460
- -0.9
-
- 50
- CoverTile
- CoverTile
-
-
-
- 54
- 5
- -1.01
- 22
- 235
-
-
- Left
- Center
-
- Outline
- TR_SCREENSONG_ARTIST_TITLE
-
-
-
-
-
- 0
- 0
- 46
- 46
- -1
-
-
-
- Menu
-
-
- 970
- 40
- 295
- 40
- -1
-
-
-
- Menu
-
-
- 970
- 550
- 295
- 40
- -1
-
-
-
-
-
-
- 975
- 45
- 220
- 25
- -1.01
-
-
-
-
- 0
- 0
- 0
- 25
- 220
-
-
- Left
- Center
-
- Outline
-
-
-
-
- CloseIcon
- CloseIcon
-
- 1215
- 42
- 35
- 35
- -1.01
-
-
-
-
- 180
- 7
- 0
- 25
- 350
-
-
- Center
- Center
-
- Outline
-
-
-
-
- SaveIcon
- SaveIcon
-
- 1175
- 553
- 35
- 35
- -1.01
-
-
-
-
- 180
- 5
- 0
- 25
- 350
-
-
- Center
- Center
-
- Outline
-
-
-
-
- DeleteIcon
- DeleteIcon
-
- 1215
- 553
- 35
- 35
- -1.01
-
-
-
-
- 180
- 5
- 0
- 25
- 350
-
-
- Center
- Center
-
- Outline
-
-
-
-
- SingIcon
- SingIcon
-
- 975
- 553
- 35
- 35
- -1.01
-
-
-
-
- 180
- 5
- 0
- 25
- 350
-
-
- Center
- Center
-
- Outline
-
-
-
-
- Button
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- SelectSlideArrowLeft
- SelectSlideArrowRight
-
- 0
- 28
- 293
- 24
- -1.01
-
-
- 54
- 30
- 20
- 20
- -1.02
-
-
- 271
- 30
- 20
- 20
- -1.02
-
-
-
-
-
-
-
- 22.00
- 25.00
- 230.00
- Outline
- Bold
- 1
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenTest.xml b/Output/Themes/Ambient/Screens/ScreenTest.xml
deleted file mode 100644
index 6958eb63..00000000
--- a/Output/Themes/Ambient/Screens/ScreenTest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- ScreenTest
- 1
-
-
-
- None
-
-
-
-
- 0
- 0
- 0
- 1
-
-
-
-
diff --git a/Output/Themes/Ambient/ScrollDown.png b/Output/Themes/Ambient/ScrollDown.png
deleted file mode 100644
index 94bd2e14..00000000
Binary files a/Output/Themes/Ambient/ScrollDown.png and /dev/null differ
diff --git a/Output/Themes/Ambient/ScrollUp.png b/Output/Themes/Ambient/ScrollUp.png
deleted file mode 100644
index c3b4c6b9..00000000
Binary files a/Output/Themes/Ambient/ScrollUp.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SelectSlide.png b/Output/Themes/Ambient/SelectSlide.png
deleted file mode 100644
index 167beb4e..00000000
Binary files a/Output/Themes/Ambient/SelectSlide.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SelectSlideArrowLeft.png b/Output/Themes/Ambient/SelectSlideArrowLeft.png
deleted file mode 100644
index 313fe280..00000000
Binary files a/Output/Themes/Ambient/SelectSlideArrowLeft.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SelectSlideArrowRight.png b/Output/Themes/Ambient/SelectSlideArrowRight.png
deleted file mode 100644
index 7dfd68c0..00000000
Binary files a/Output/Themes/Ambient/SelectSlideArrowRight.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SelectSlidePlayer.png b/Output/Themes/Ambient/SelectSlidePlayer.png
deleted file mode 100644
index 2a100dbd..00000000
Binary files a/Output/Themes/Ambient/SelectSlidePlayer.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Sing.png b/Output/Themes/Ambient/Sing.png
deleted file mode 100644
index c7daf961..00000000
Binary files a/Output/Themes/Ambient/Sing.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml
deleted file mode 100644
index b1ab5aa9..00000000
--- a/Output/Themes/Ambient/Skin Blue.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-
-
- 4
-
- Blue
- bohning
- 0
- 0
-
-
-
- 0.000
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 1.000
- 0.000
- 1.000
-
-
- 0.500
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.800
- 0.000
- 1.000
-
-
- 1.000
- 0.000
- 0.500
- 1.000
-
-
- 0.000
- 0.000
- 0.750
- 1.000
-
-
- 0.675
- 0.890
- 0.969
- 1.000
-
-
- 0.675
- 0.890
- 0.969
- 0.500
-
-
- 0.675
- 0.890
- 0.969
- 0.600
-
-
- 0.675
- 0.890
- 0.969
- 0.300
-
-
- 0.675
- 0.890
- 0.969
- 1.000
-
-
- 0.675
- 0.890
- 0.969
- 0.500
-
-
- 0.675
- 0.890
- 0.969
- 1.000
-
-
- 0.675
- 0.890
- 0.969
- 1.000
-
-
- 0.675
- 0.890
- 0.969
- 0.500
-
-
- 0.675
- 0.890
- 0.969
- 0.500
-
-
- 0.675
- 0.890
- 0.969
- 0.300
-
-
- 0.675
- 0.890
- 0.969
- 1.000
-
-
- 0.675
- 0.890
- 0.969
- 0.500
-
-
- 0.675
- 0.890
- 0.969
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 0.000
-
-
- 0.000
- 0.000
- 1.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 0.300
- 0.300
- 0.300
- 1.000
-
-
- 0.000
- 0.000
- 1.000
- 0.500
-
-
- 0.800
- 0.950
- 1.000
- 0.500
-
-
- 0.800
- 0.950
- 1.000
- 0.850
-
-
-
- [Blue]BG_Default.png
- [Blue]BG_Options.png
-
-
- CoverTile.png
- CoverBackground.png
- Cursor.png
- TimeBar.png
- TimeLine.png
- Pointer.png
- SelectSlide.png
- SelectSlidePlayer.png
- SelectSlideArrowLeft.png
- SelectSlideArrowRight.png
- notes_left.png
- notes_mid.png
- notes_right.png
- notes_bg_left.png
- notes_bg_mid.png
- notes_bg_right.png
- points_bar.png
- points_bar_bg.png
- Lyrics.png
- LyricHelper.png
- ToneHelper.png
- TextBG.png
- Score.png
- Star.png
- Snowflake.png
- SongMenu.png
- PerfectNoteStar.png
- Pause.png
- EnergyBeam.png
- DuetIcon.png
- VideoIcon.png
- VideoIconCO.png
- VideoIconBG.png
- MedleyCalcIcon.png
- MedleyTagIcon.png
- PlayerSelector.png
- PreviousIcon.png
- NextIcon.png
- PlayIcon.png
- PauseIcon.png
- RepeatIcon.png
- SongMenuBG.png
- Close.png
- Delete.png
- Save.png
- Sing.png
- Minus.png
- Plus.png
- Random.png
- Popup.png
- ScrollUp.png
- ScrollDown.png
-
-
- [Blue]BG_Video.mp4
- [Blue]IntroIn.mp4
- [Blue]IntroMid.mp4
- [Blue]IntroOut.mp4
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml
deleted file mode 100644
index 3b6e3ba8..00000000
--- a/Output/Themes/Ambient/Skin Green.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-
-
- 4
-
- Green
- bohning
- 0
- 0
-
-
-
- 0.000
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 1.000
- 0.000
- 1.000
-
-
- 0.500
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.800
- 0.000
- 1.000
-
-
- 1.000
- 0.000
- 0.500
- 1.000
-
-
- 0.000
- 0.750
- 0.000
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 0.500
-
-
- 0.709
- 0.968
- 0.674
- 0.600
-
-
- 0.709
- 0.968
- 0.674
- 0.300
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 0.500
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 0.500
-
-
- 0.709
- 0.968
- 0.674
- 0.300
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 0.500
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 0.000
-
-
- 0.000
- 1.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 0.300
- 0.300
- 0.300
- 1.000
-
-
- 0.000
- 1.000
- 0.000
- 0.500
-
-
- 0.800
- 1.000
- 0.811
- 0.500
-
-
- 0.800
- 1.000
- 0.811
- 0.811
-
-
-
- [Green]BG_Default.png
- [Green]BG_Options.png
-
-
- CoverTile.png
- CoverBackground.png
- Cursor.png
- TimeBar.png
- TimeLine.png
- Pointer.png
- SelectSlide.png
- SelectSlidePlayer.png
- SelectSlideArrowLeft.png
- SelectSlideArrowRight.png
- notes_left.png
- notes_mid.png
- notes_right.png
- notes_bg_left.png
- notes_bg_mid.png
- notes_bg_right.png
- points_bar.png
- points_bar_bg.png
- Lyrics.png
- LyricHelper.png
- ToneHelper.png
- TextBG.png
- Score.png
- Star.png
- Snowflake.png
- SongMenu.png
- PerfectNoteStar.png
- Pause.png
- EnergyBeam.png
- DuetIcon.png
- VideoIcon.png
- VideoIconCO.png
- VideoIconBG.png
- MedleyCalcIcon.png
- MedleyTagIcon.png
- PlayerSelector.png
- PreviousIcon.png
- NextIcon.png
- PlayIcon.png
- PauseIcon.png
- RepeatIcon.png
- SongMenuBG.png
- Close.png
- Delete.png
- Save.png
- Sing.png
- Minus.png
- Plus.png
- Random.png
- Popup.png
- ScrollUp.png
- ScrollDown.png
-
-
- [Green]BG_Video.mp4
- [Green]IntroIn.mp4
- [Green]IntroMid.mp4
- [Green]IntroOut.mp4
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml
deleted file mode 100644
index 0f65931e..00000000
--- a/Output/Themes/Ambient/Skin Red.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-
-
- 4
-
- Red
- bohning
- 0
- 0
-
-
-
- 0.000
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 1.000
- 0.000
- 1.000
-
-
- 0.500
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.800
- 0.000
- 1.000
-
-
- 1.000
- 0.000
- 0.500
- 1.000
-
-
- 0.750
- 0.000
- 0.000
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 0.500
-
-
- 0.968
- 0.674
- 0.674
- 0.600
-
-
- 0.968
- 0.674
- 0.674
- 0.300
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 0.500
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 0.500
-
-
- 0.968
- 0.674
- 0.674
- 0.300
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 0.500
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 0.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 0.300
- 0.300
- 0.300
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 0.500
-
-
- 1.000
- 0.800
- 0.800
- 0.500
-
-
- 1.000
- 0.800
- 0.800
- 0.850
-
-
-
- [Red]BG_Default.png
- [Red]BG_Options.png
-
-
- CoverTile.png
- CoverBackground.png
- Cursor.png
- TimeBar.png
- TimeLine.png
- Pointer.png
- SelectSlide.png
- SelectSlidePlayer.png
- SelectSlideArrowLeft.png
- SelectSlideArrowRight.png
- notes_left.png
- notes_mid.png
- notes_right.png
- notes_bg_left.png
- notes_bg_mid.png
- notes_bg_right.png
- points_bar.png
- points_bar_bg.png
- Lyrics.png
- LyricHelper.png
- ToneHelper.png
- TextBG.png
- Score.png
- Star.png
- Snowflake.png
- SongMenu.png
- PerfectNoteStar.png
- Pause.png
- EnergyBeam.png
- DuetIcon.png
- VideoIcon.png
- VideoIconCO.png
- VideoIconBG.png
- MedleyCalcIcon.png
- MedleyTagIcon.png
- PlayerSelector.png
- PreviousIcon.png
- NextIcon.png
- PlayIcon.png
- PauseIcon.png
- RepeatIcon.png
- SongMenuBG.png
- Close.png
- Delete.png
- Save.png
- Sing.png
- Minus.png
- Plus.png
- Random.png
- Popup.png
- ScrollUp.png
- ScrollDown.png
-
-
- [Red]BG_Video.mp4
- [Red]IntroIn.mp4
- [Red]IntroMid.mp4
- [Red]IntroOut.mp4
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml
deleted file mode 100644
index 48c2176b..00000000
--- a/Output/Themes/Ambient/Skin Yellow.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-
-
- 4
-
- Yellow
- bohning
- 0
- 0
-
-
-
- 0.000
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 1.000
- 0.000
- 1.000
-
-
- 0.500
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.800
- 0.000
- 1.000
-
-
- 1.000
- 0.000
- 0.500
- 1.000
-
-
- 0.750
- 0.750
- 0.000
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 0.500
-
-
- 0.968
- 0.956
- 0.674
- 0.600
-
-
- 0.968
- 0.956
- 0.674
- 0.300
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 0.500
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 0.500
-
-
- 0.968
- 0.956
- 0.674
- 0.300
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 0.500
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 0.000
-
-
- 1.000
- 1.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 0.300
- 0.300
- 0.300
- 1.000
-
-
- 1.000
- 1.000
- 0.000
- 0.500
-
-
- 0.949
- 1.000
- 0.800
- 0.500
-
-
- 0.949
- 1.000
- 0.800
- 0.850
-
-
-
- [Yellow]BG_Default.png
- [Yellow]BG_Options.png
-
-
- CoverTile.png
- CoverBackground.png
- Cursor.png
- TimeBar.png
- TimeLine.png
- Pointer.png
- SelectSlide.png
- SelectSlidePlayer.png
- SelectSlideArrowLeft.png
- SelectSlideArrowRight.png
- notes_left.png
- notes_mid.png
- notes_right.png
- notes_bg_left.png
- notes_bg_mid.png
- notes_bg_right.png
- points_bar.png
- points_bar_bg.png
- Lyrics.png
- LyricHelper.png
- ToneHelper.png
- TextBG.png
- Score.png
- Star.png
- Snowflake.png
- SongMenu.png
- PerfectNoteStar.png
- Pause.png
- EnergyBeam.png
- DuetIcon.png
- VideoIcon.png
- VideoIconCO.png
- VideoIconBG.png
- MedleyCalcIcon.png
- MedleyTagIcon.png
- PlayerSelector.png
- PreviousIcon.png
- NextIcon.png
- PlayIcon.png
- PauseIcon.png
- RepeatIcon.png
- SongMenuBG.png
- Close.png
- Delete.png
- Save.png
- Sing.png
- Minus.png
- Plus.png
- Random.png
- Popup.png
- ScrollUp.png
- ScrollDown.png
-
-
- [Yellow]BG_Video.mp4
- [Yellow]IntroIn.mp4
- [Yellow]IntroMid.mp4
- [Yellow]IntroOut.mp4
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Snowflake.png b/Output/Themes/Ambient/Snowflake.png
deleted file mode 100644
index 6ca81fdd..00000000
Binary files a/Output/Themes/Ambient/Snowflake.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SongMenu.png b/Output/Themes/Ambient/SongMenu.png
deleted file mode 100644
index 6e6b0c6b..00000000
Binary files a/Output/Themes/Ambient/SongMenu.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SongMenuBG.png b/Output/Themes/Ambient/SongMenuBG.png
deleted file mode 100644
index a7333adb..00000000
Binary files a/Output/Themes/Ambient/SongMenuBG.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Star.png b/Output/Themes/Ambient/Star.png
deleted file mode 100644
index d866cfb6..00000000
Binary files a/Output/Themes/Ambient/Star.png and /dev/null differ
diff --git a/Output/Themes/Ambient/TextBG.png b/Output/Themes/Ambient/TextBG.png
deleted file mode 100644
index d565435d..00000000
Binary files a/Output/Themes/Ambient/TextBG.png and /dev/null differ
diff --git a/Output/Themes/Ambient/TimeBar.png b/Output/Themes/Ambient/TimeBar.png
deleted file mode 100644
index a3e1bf10..00000000
Binary files a/Output/Themes/Ambient/TimeBar.png and /dev/null differ
diff --git a/Output/Themes/Ambient/TimeBar2.png b/Output/Themes/Ambient/TimeBar2.png
deleted file mode 100644
index 64b4264a..00000000
Binary files a/Output/Themes/Ambient/TimeBar2.png and /dev/null differ
diff --git a/Output/Themes/Ambient/TimeLine.png b/Output/Themes/Ambient/TimeLine.png
deleted file mode 100644
index 664fb882..00000000
Binary files a/Output/Themes/Ambient/TimeLine.png and /dev/null differ
diff --git a/Output/Themes/Ambient/ToneHelper.png b/Output/Themes/Ambient/ToneHelper.png
deleted file mode 100644
index 91dce055..00000000
Binary files a/Output/Themes/Ambient/ToneHelper.png and /dev/null differ
diff --git a/Output/Themes/Ambient/VideoIcon.png b/Output/Themes/Ambient/VideoIcon.png
deleted file mode 100644
index 4abc12a6..00000000
Binary files a/Output/Themes/Ambient/VideoIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/VideoIconBG.png b/Output/Themes/Ambient/VideoIconBG.png
deleted file mode 100644
index ff0950fe..00000000
Binary files a/Output/Themes/Ambient/VideoIconBG.png and /dev/null differ
diff --git a/Output/Themes/Ambient/VideoIconCO.png b/Output/Themes/Ambient/VideoIconCO.png
deleted file mode 100644
index 3c76dd30..00000000
Binary files a/Output/Themes/Ambient/VideoIconCO.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Warning.png b/Output/Themes/Ambient/Warning.png
deleted file mode 100644
index 208f5730..00000000
Binary files a/Output/Themes/Ambient/Warning.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Blue]BG_Default.png b/Output/Themes/Ambient/[Blue]BG_Default.png
deleted file mode 100644
index 53bd3603..00000000
Binary files a/Output/Themes/Ambient/[Blue]BG_Default.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Blue]BG_Options.png b/Output/Themes/Ambient/[Blue]BG_Options.png
deleted file mode 100644
index dfb174e6..00000000
Binary files a/Output/Themes/Ambient/[Blue]BG_Options.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Green]BG_Default.png b/Output/Themes/Ambient/[Green]BG_Default.png
deleted file mode 100644
index 77891e93..00000000
Binary files a/Output/Themes/Ambient/[Green]BG_Default.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Green]BG_Options.png b/Output/Themes/Ambient/[Green]BG_Options.png
deleted file mode 100644
index 44da3862..00000000
Binary files a/Output/Themes/Ambient/[Green]BG_Options.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Red]BG_Default.png b/Output/Themes/Ambient/[Red]BG_Default.png
deleted file mode 100644
index 61f1900b..00000000
Binary files a/Output/Themes/Ambient/[Red]BG_Default.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Red]BG_Options.png b/Output/Themes/Ambient/[Red]BG_Options.png
deleted file mode 100644
index 6ca46be7..00000000
Binary files a/Output/Themes/Ambient/[Red]BG_Options.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Yellow]BG_Default.png b/Output/Themes/Ambient/[Yellow]BG_Default.png
deleted file mode 100644
index 97dc8eb4..00000000
Binary files a/Output/Themes/Ambient/[Yellow]BG_Default.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Yellow]BG_Options.png b/Output/Themes/Ambient/[Yellow]BG_Options.png
deleted file mode 100644
index e7563e3f..00000000
Binary files a/Output/Themes/Ambient/[Yellow]BG_Options.png and /dev/null differ
diff --git a/Output/Themes/Ambient/copyright Neon Glow Icons.txt b/Output/Themes/Ambient/copyright Neon Glow Icons.txt
deleted file mode 100644
index 25a29b81..00000000
--- a/Output/Themes/Ambient/copyright Neon Glow Icons.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.webdesign-guru.co.uk/icon/neon-glow-icons/
diff --git a/Output/Themes/Ambient/notes_bg_left.png b/Output/Themes/Ambient/notes_bg_left.png
deleted file mode 100644
index 14dee215..00000000
Binary files a/Output/Themes/Ambient/notes_bg_left.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_bg_mid.png b/Output/Themes/Ambient/notes_bg_mid.png
deleted file mode 100644
index 4161d17b..00000000
Binary files a/Output/Themes/Ambient/notes_bg_mid.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_bg_right.png b/Output/Themes/Ambient/notes_bg_right.png
deleted file mode 100644
index fd3fb69a..00000000
Binary files a/Output/Themes/Ambient/notes_bg_right.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_left.png b/Output/Themes/Ambient/notes_left.png
deleted file mode 100644
index 310c7e87..00000000
Binary files a/Output/Themes/Ambient/notes_left.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_mid.png b/Output/Themes/Ambient/notes_mid.png
deleted file mode 100644
index ddf450c1..00000000
Binary files a/Output/Themes/Ambient/notes_mid.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_right.png b/Output/Themes/Ambient/notes_right.png
deleted file mode 100644
index 681b4aa4..00000000
Binary files a/Output/Themes/Ambient/notes_right.png and /dev/null differ
diff --git a/Output/Themes/Ambient/points_bar.png b/Output/Themes/Ambient/points_bar.png
deleted file mode 100644
index e5032bc5..00000000
Binary files a/Output/Themes/Ambient/points_bar.png and /dev/null differ
diff --git a/Output/Themes/Ambient/points_bar_bg.png b/Output/Themes/Ambient/points_bar_bg.png
deleted file mode 100644
index 968860cb..00000000
Binary files a/Output/Themes/Ambient/points_bar_bg.png and /dev/null differ
diff --git a/Output/Themes/Changelog/Changelog_ScreenHighscore.txt b/Output/Themes/Changelog/Changelog_ScreenHighscore.txt
deleted file mode 100644
index 6849c941..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenHighscore.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ScreenHighscore
-
-++++++++++
-Version 2:
-
-Add: ParticleEffectsNew[1..10] (one for each entry!)
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenLoading.txt b/Output/Themes/Changelog/Changelog_ScreenLoading.txt
deleted file mode 100644
index 0bca1ed6..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenLoading.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ScreenLoading
-
-++++++++++
-Version 2:
-
-Rename: ->
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenMain.txt b/Output/Themes/Changelog/Changelog_ScreenMain.txt
deleted file mode 100644
index b3eb3bb7..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenMain.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-SceenMain
-
-++++++++++
-Version 2:
-
-Add:
-
-
-
-
diff --git a/Output/Themes/Changelog/Changelog_ScreenNames.txt b/Output/Themes/Changelog/Changelog_ScreenNames.txt
deleted file mode 100644
index 221c9331..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenNames.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-SceenNames
-
-++++++++++
-Version 3:
-
- (One Equalizer for each player): Equalizer shows input from assigned mic for this player.
- (One SelectSlide for each player)
-
-++++++++++
-Version 2:
-
-Add:
-
-A new Theme-element for name-selecting.
-
- (One Static for each player): Static wich is used as drop-area
- (One Static for each player): Static wich shows the avatar of selected player
- (One Text for each player): Text wich shows name of selected player
-
-
-
-
-Rename:
- to
- to
-
-Remove:
-, , , , ,
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt
deleted file mode 100644
index e60b7e4a..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-ScreenOptionsGame
-
-++++++++++
-Version 2:
-
-Add:
-
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsLyrics.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsLyrics.txt
deleted file mode 100644
index 2c584a57..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsLyrics.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-ScreenOptionsSound
-++++++++++
-Version 2:
-Rename to
-++++++++++
-Version 1:
-
-Add:
-
-
-
-
-
-
-and some texts for description (Text1, Text2, Text3)
-TR_SCREENOLYRICS_OPTIONS
-TR_SCREENOLYRICS_STYLE
-TR_SCREENOLYRICS_ONTOP
-++++++++++
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsRecord.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsRecord.txt
deleted file mode 100644
index 1eb9f362..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsRecord.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ScreenOptionsRecord
-
-++++++++++
-Version 2:
-
-Add:
- and .
-This is a new theme-element. Check ScreenOptionsRecord.xml for style-possibilities.
-++++++++++
-Version 4:
-Rename Text 3/4 to TextChannel1/2
-Rename Text5 to Text3
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsSound.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsSound.txt
deleted file mode 100644
index d83bd921..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsSound.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ScreenOptionsSound
-
-++++++++++
-Version 3:
-
-Add:
-
-
-
-
-and some texts for description (Text5, Text6)
-"TR_SCRsEENOSOUND_PREVIEWMUSICVOLUME"
-"TR_SCREENOSOUND_GAMEMUSICVOLUEM"
-
-++++++++++
-Version 2:
-
-Add:
-
-
-
-
-
-
-
-and some texts for description (Text2, Text3, Text4)
-"TR_SCREENOSOUND_BACKGROUNDMUSIC"
-"TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME"
-"TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE"
-++++++++++
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsTheme.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsTheme.txt
deleted file mode 100644
index a8c28341..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsTheme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ScreenOptionsTheme
-
-++++++++++
-Version 3:
-
-Add:
-
-and some texts and statics for description (Text9 and Static9)
-"TR_SCREENOTHEME_FADEINFO"
-++++++++++
-Version 2:
-
-Add:
-
-and some texts and statics for description (Text8 and Static8)
-"TR_SCREENOTHEME_COVERLOADING"
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt
deleted file mode 100644
index 9e8d37df..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-++++++++++
-Version 5:
-
-Rename:
-Text5/6 to TextWebcam/TextWebcamResolution
-
-++++++++++
-Version 4:
-
-Add:
-
-
-++++++++++
-Version 3:
-
-Add:
-, ,
-
-and some texts and static for description (Text6, Text7)
-"TR_SCREENO_VIDEO_WEBCAMDEVICES", "TR_SCREENO_VIDEO_WEBCAMCAPABILITIES"
-
-++++++++++
-Version 2:
-
-Add:
-
-and some texts and statics for description (Text5)
-"TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND"
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenProfiles.txt b/Output/Themes/Changelog/Changelog_ScreenProfiles.txt
deleted file mode 100644
index 3c741fc1..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenProfiles.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ScreenProfiles
-++++++++++
-Version 3:
-Rename: to
-
-++++++++++
-Version 2:
-
-Add: , , ,
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenScore.txt b/Output/Themes/Changelog/Changelog_ScreenScore.txt
deleted file mode 100644
index 611a2621..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenScore.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ScreenScore
-++++++++++
-Version 3:
-Add , , to change text-string with player-num >=
-Add , set to "vertical" to draw animation in vertical direction.
-++++++++++
-Version 2:
-
-Add: Elements for up to 6 players! (Texts and statics!)
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenSing.txt b/Output/Themes/Changelog/Changelog_ScreenSing.txt
deleted file mode 100644
index dd1ef423..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenSing.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-ScreenSing
-
-+++++++++
-Version 7
-
-Add:
- !text-position and size will be overwritten by vocaluxe!
- Only shown if N$ matches Number of players
- Only shown if N$ matches Number of players
-
-+++++++++
-Version 6
-
-Add:
- and (only showed when sining duet)
-
-++++++++++
-Version 5:
-
-Add:
-
-
-++++++++++
-Version 4:
-Added Elements for 6-player-singing!
-
-Add:
- (One for each player for each player-number>
- (One for each player for each player-number>
-
-
-++++++++++
-Version 3:
-
-Add:
-
-and
-
-
-The Textures and Colors are used by the expanded time bar.
-
-++++++++++
-Version 2:
-
-Add:
-
-or
-, , ,
-to Lyric-Elements.
-This option set the color of highlighting lyrics.
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenSong.txt b/Output/Themes/Changelog/Changelog_ScreenSong.txt
deleted file mode 100644
index 84b853fb..00000000
--- a/Output/Themes/Changelog/Changelog_ScreenSong.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-ScreenSong
-
-++++++++++
-Version 5:
-
-Add:
-
-Remove:
-ButtonOptionsOpenPlaylist
-
-++++++++++
-Version 4:
-
-Add:
- (one for each player)
-,
-
-
-++++++++++
-Version 3:
-
-Add:
-
-
-, , , , , , , ,
-, ,
-and
- as a new Screen-Element. For details, look at ScreenSong.xml
-
-++++++++++
-Version 2:
-
-Add:
- and
-to SongMenu
-
-Add:
- and
-to SongMenu.SongMenuTileBoard
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_SkinSystem.txt b/Output/Themes/Changelog/Changelog_SkinSystem.txt
deleted file mode 100644
index ce2085ae..00000000
--- a/Output/Themes/Changelog/Changelog_SkinSystem.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Skin System
-
-++++++++++
-Version 4:
-All Colors in (Playercolors and ColorSchemes)
-
-++++++++++
-Version 3:
-
-Added videos:
-
-
-
-
-++++++++++
-
-
-++++++++++
-Version 2:
-
-Changed:
-
-to
-
-++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ThemeSystem.txt b/Output/Themes/Changelog/Changelog_ThemeSystem.txt
deleted file mode 100644
index fceb7c3f..00000000
--- a/Output/Themes/Changelog/Changelog_ThemeSystem.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Theme System
-
-
-++++++++++
-Version 5 (yes it's still 5!):
-
-Added:
- to Texts (horizontal align)
-
-It's optional. Possible values: Top, Center, Bottom (default: Center)
-It's for downsizing only (if the text-width reaches MaxW).
-
-
-++++++++++
-Version 5:
-
-Added:
- outline thickness 0..1
- outline color red
- outline color green
- outline color blue
- outline color alpha
-
-to Fonts
-
-
-++++++++++
-Version 4:
-
-Added:
-, ,
-and
-, , ,
-and
- or
, , ,
-on SelectSlide-Elements
-
-Added support for Theme-Fonts (optional)
-
-TextFont: Text font name
-TextMaxW: Maximum text width for each element
-HColor: Highlighted Color (selected but not focused)
-
-++++++++++
-Version 3:
-
-Added:
-
-on SongMenu-Elements
-
-
-++++++++++
-Version 2:
-
-Changed:
-
-to
-
-on Button-Elements.
-
-
-Changed:
-
-to
-
-on SelectSlide-Elements.
-
-Changed:
-, , and
-to
-, , and
-on SelectSlide-Elements.
-
-
-Changed:
-
-to
-
-on SelectSlide-Elements.
-
-Changed:
-, , and
-to
-, , and
-on SelectSlide-Elements.
-
-
-Changed:
-, , and
-to
-, , and
-on SelectSlide-Elements.
-++++++++++
\ No newline at end of file
diff --git a/Output/glib-sharp.dll b/Output/glib-sharp.dll
deleted file mode 100644
index a4e18a6f..00000000
Binary files a/Output/glib-sharp.dll and /dev/null differ
diff --git a/Output/gstreamer-sharp.dll b/Output/gstreamer-sharp.dll
deleted file mode 100644
index 42183595..00000000
Binary files a/Output/gstreamer-sharp.dll and /dev/null differ
diff --git a/Output/x64/PortAudio.dll b/Output/x64/PortAudio.dll
deleted file mode 100644
index 033672a2..00000000
Binary files a/Output/x64/PortAudio.dll and /dev/null differ
diff --git a/Output/x64/SQLite.Interop.dll b/Output/x64/SQLite.Interop.dll
deleted file mode 100644
index 0188070e..00000000
Binary files a/Output/x64/SQLite.Interop.dll and /dev/null differ
diff --git a/Output/x64/SlimDX.dll b/Output/x64/SlimDX.dll
deleted file mode 100644
index 36d058d1..00000000
Binary files a/Output/x64/SlimDX.dll and /dev/null differ
diff --git a/Output/x64/System.Data.SQLite.dll b/Output/x64/System.Data.SQLite.dll
deleted file mode 100644
index 1ee930f1..00000000
Binary files a/Output/x64/System.Data.SQLite.dll and /dev/null differ
diff --git a/Output/x64/acinerella.dll b/Output/x64/acinerella.dll
deleted file mode 100644
index eb6998e6..00000000
Binary files a/Output/x64/acinerella.dll and /dev/null differ
diff --git a/Output/x64/avcodec-54.dll b/Output/x64/avcodec-54.dll
deleted file mode 100644
index 193d96cb..00000000
Binary files a/Output/x64/avcodec-54.dll and /dev/null differ
diff --git a/Output/x64/avformat-54.dll b/Output/x64/avformat-54.dll
deleted file mode 100644
index 67041399..00000000
Binary files a/Output/x64/avformat-54.dll and /dev/null differ
diff --git a/Output/x64/avutil-52.dll b/Output/x64/avutil-52.dll
deleted file mode 100644
index c7ca9619..00000000
Binary files a/Output/x64/avutil-52.dll and /dev/null differ
diff --git a/Output/x64/hidapi.dll b/Output/x64/hidapi.dll
deleted file mode 100644
index 54422765..00000000
Binary files a/Output/x64/hidapi.dll and /dev/null differ
diff --git a/Output/x64/libgstreamersharpglue-1.0.0.dll b/Output/x64/libgstreamersharpglue-1.0.0.dll
deleted file mode 100644
index 22022133..00000000
Binary files a/Output/x64/libgstreamersharpglue-1.0.0.dll and /dev/null differ
diff --git a/Output/x64/swresample-0.dll b/Output/x64/swresample-0.dll
deleted file mode 100644
index 9b3af43d..00000000
Binary files a/Output/x64/swresample-0.dll and /dev/null differ
diff --git a/Output/x64/swscale-2.dll b/Output/x64/swscale-2.dll
deleted file mode 100644
index 5d6588fe..00000000
Binary files a/Output/x64/swscale-2.dll and /dev/null differ
diff --git a/Output/x86/PortAudio.dll b/Output/x86/PortAudio.dll
deleted file mode 100644
index 0367aa1e..00000000
Binary files a/Output/x86/PortAudio.dll and /dev/null differ
diff --git a/Output/x86/SQLite.Interop.dll b/Output/x86/SQLite.Interop.dll
deleted file mode 100644
index 89523cfb..00000000
Binary files a/Output/x86/SQLite.Interop.dll and /dev/null differ
diff --git a/Output/x86/SlimDX.dll b/Output/x86/SlimDX.dll
deleted file mode 100644
index 1593c2a6..00000000
Binary files a/Output/x86/SlimDX.dll and /dev/null differ
diff --git a/Output/x86/System.Data.SQLite.dll b/Output/x86/System.Data.SQLite.dll
deleted file mode 100644
index 1ee930f1..00000000
Binary files a/Output/x86/System.Data.SQLite.dll and /dev/null differ
diff --git a/Output/x86/acinerella.dll b/Output/x86/acinerella.dll
deleted file mode 100644
index f651542d..00000000
Binary files a/Output/x86/acinerella.dll and /dev/null differ
diff --git a/Output/x86/avcodec-54.dll b/Output/x86/avcodec-54.dll
deleted file mode 100644
index 7b08c266..00000000
Binary files a/Output/x86/avcodec-54.dll and /dev/null differ
diff --git a/Output/x86/avformat-54.dll b/Output/x86/avformat-54.dll
deleted file mode 100644
index 9dc249e0..00000000
Binary files a/Output/x86/avformat-54.dll and /dev/null differ
diff --git a/Output/x86/avutil-52.dll b/Output/x86/avutil-52.dll
deleted file mode 100644
index 100dc0f5..00000000
Binary files a/Output/x86/avutil-52.dll and /dev/null differ
diff --git a/Output/x86/hidapi.dll b/Output/x86/hidapi.dll
deleted file mode 100644
index 7bdc8fe2..00000000
Binary files a/Output/x86/hidapi.dll and /dev/null differ
diff --git a/Output/x86/libgstreamersharpglue-1.0.0.dll b/Output/x86/libgstreamersharpglue-1.0.0.dll
deleted file mode 100644
index 37ddbf48..00000000
Binary files a/Output/x86/libgstreamersharpglue-1.0.0.dll and /dev/null differ
diff --git a/Output/x86/swresample-0.dll b/Output/x86/swresample-0.dll
deleted file mode 100644
index 6a77631b..00000000
Binary files a/Output/x86/swresample-0.dll and /dev/null differ
diff --git a/Output/x86/swscale-2.dll b/Output/x86/swscale-2.dll
deleted file mode 100644
index f3b957f8..00000000
Binary files a/Output/x86/swscale-2.dll and /dev/null differ
diff --git a/PitchTracker/PitchTracker.vcxproj b/PitchTracker/PitchTracker.vcxproj
index 06c0b94c..a11f5c01 100644
--- a/PitchTracker/PitchTracker.vcxproj
+++ b/PitchTracker/PitchTracker.vcxproj
@@ -28,26 +28,39 @@
DynamicLibrary
true
- v110_xp
+ v100_xp
+ v110_xp
+ v120_xp
+ v140_xp
Unicode
DynamicLibrary
true
v110_xp
+ v100_xp
+ v110_xp
+ v120_xp
+ v140_xp
Unicode
DynamicLibrary
false
- v110_xp
+ v100_xp
+ v110_xp
+ v120_xp
+ v140_xp
true
Unicode
DynamicLibrary
false
- v110_xp
+ v100_xp
+ v110_xp
+ v120_xp
+ v140_xp
true
Unicode
@@ -102,7 +115,7 @@
true
- xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\" /I /Y
+ xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\libs\unmanaged\x64\" /I /Y
@@ -120,7 +133,7 @@
true
- xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\" /I /Y
+ xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\libs\unmanaged\x86\" /I /Y
@@ -143,7 +156,7 @@
true
- xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\" /I /Y
+ xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\libs\unmanaged\x64\" /I /Y
@@ -165,7 +178,7 @@
true
- xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\" /I /Y
+ xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\libs\unmanaged\x86\" /I /Y
@@ -198,4 +211,7 @@
+
+
+
\ No newline at end of file
diff --git a/Vocaluxe.sln b/Vocaluxe.sln
index 96b931ee..cf005e1b 100644
--- a/Vocaluxe.sln
+++ b/Vocaluxe.sln
@@ -181,6 +181,8 @@ Global
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x64.Build.0 = Release|x64
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.ActiveCfg = Release|Win32
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.Build.0 = Release|Win32
+ {93356718-3A0B-4784-AAE1-215065BFFC66}.DebugLinux|x64.ActiveCfg = Debug|x64
+ {93356718-3A0B-4784-AAE1-215065BFFC66}.DebugLinux|x86.ActiveCfg = Debug|x86
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugWin|x64.ActiveCfg = Debug|x64
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugWin|x64.Build.0 = Debug|x64
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugWin|x86.ActiveCfg = Debug|x86
@@ -189,6 +191,8 @@ Global
{93356718-3A0B-4784-AAE1-215065BFFC66}.InstallerWin|x64.Build.0 = Release|x64
{93356718-3A0B-4784-AAE1-215065BFFC66}.InstallerWin|x86.ActiveCfg = Release|x86
{93356718-3A0B-4784-AAE1-215065BFFC66}.InstallerWin|x86.Build.0 = Release|x86
+ {93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseLinux|x64.ActiveCfg = Release|x64
+ {93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseLinux|x86.ActiveCfg = Release|x86
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseWin|x64.ActiveCfg = Release|x64
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseWin|x64.Build.0 = Release|x64
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseWin|x86.ActiveCfg = Release|x86
diff --git a/Vocaluxe.sln.DotSettings b/Vocaluxe.sln.DotSettings
index 04c102da..5821e368 100644
--- a/Vocaluxe.sln.DotSettings
+++ b/Vocaluxe.sln.DotSettings
@@ -117,6 +117,7 @@ along with $SOLUTION$. If not, see <http://www.gnu.org/licenses/>.<Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Classes"><ElementKinds><Kind Name="CLASS" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="C" Suffix="" Style="AaBb" /></Policy>
<Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected" Description="Fields (not public)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /><Kind Name="METHOD" /><Kind Name="PROPERTY" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /></Policy>
<Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Structs"><ElementKinds><Kind Name="STRUCT" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="S" Suffix="" Style="AaBb" /></Policy>
+ True
True
True
False
diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs
index 9aede7f7..c3bffe57 100644
--- a/Vocaluxe/Base/CParty.cs
+++ b/Vocaluxe/Base/CParty.cs
@@ -277,10 +277,11 @@ namespace Vocaluxe.Base
return null;
var compilerParams = new CompilerParameters();
+
compilerParams.ReferencedAssemblies.Add("System.Windows.Forms.dll");
compilerParams.ReferencedAssemblies.Add("System.dll");
compilerParams.ReferencedAssemblies.Add("System.Core.dll");
- compilerParams.ReferencedAssemblies.Add("VocaluxeLib.dll");
+ compilerParams.ReferencedAssemblies.Add("libs\\managed\\VocaluxeLib.dll");
compilerParams.GenerateInMemory = true;
#if DEBUG
compilerParams.IncludeDebugInformation = true;
diff --git a/Vocaluxe/Lib/Input/CHIDAPI.cs b/Vocaluxe/Lib/Input/CHIDAPI.cs
index 881beae3..73a92ce1 100644
--- a/Vocaluxe/Lib/Input/CHIDAPI.cs
+++ b/Vocaluxe/Lib/Input/CHIDAPI.cs
@@ -43,7 +43,7 @@ namespace Vocaluxe.Lib.Input
{
#if ARCH_X86
#if WIN
- private const string _HIDApiDll = "x86\\hidapi.dll";
+ private const string _HIDApiDll = "hidapi.dll";
#endif
#if LINUX
@@ -53,7 +53,7 @@ namespace Vocaluxe.Lib.Input
#if ARCH_X64
#if WIN
- private const string _HIDApiDll = "x64\\hidapi.dll";
+ private const string _HIDApiDll = "hidapi.dll";
#endif
#if LINUX
diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
index e4cea03a..683e3d75 100644
--- a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
+++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
@@ -18,6 +18,7 @@
using Gst;
using System;
using Vocaluxe.Base;
+using System.IO;
namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
{
@@ -35,12 +36,26 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
const string varName = "GSTREAMER_1_0_ROOT_X86_64";
#endif
string gstreamerEnvVar = Environment.GetEnvironmentVariable(varName, EnvironmentVariableTarget.User);
+ string dllDirectory;
if (gstreamerEnvVar == null)
{
- CLog.LogError("Gstreamer not found! Make sure you installed it correctly and if it set the environment variable '" + varName + "'!", true);
- return false;
+#if ARCH_X86
+ dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer86\\bin\\");
+#endif
+#if ARCH_X64
+ dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer64\\bin\\");
+#endif
+ if (!Directory.Exists(dllDirectory))
+ {
+ CLog.LogError("Gstreamer not found! Make sure you installed it correctly and if it set the environment variable '" + varName + "'!", true);
+ return false;
+ }
}
- string dllDirectory = gstreamerEnvVar + "bin\\";
+ else
+ {
+ dllDirectory = gstreamerEnvVar + "bin\\";
+ }
+
COSFunctions.AddEnvironmentPath(dllDirectory);
#endif
Application.Init();
diff --git a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs
index 6df32553..8d421b91 100644
--- a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs
+++ b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs
@@ -172,7 +172,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
{
#if ARCH_X86
#if WIN
- private const string _AcDll = "x86\\acinerella.dll";
+ private const string _AcDll = "acinerella.dll";
#endif
#if LINUX
@@ -182,7 +182,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
#if ARCH_X64
#if WIN
- private const string _AcDll = "x64\\acinerella.dll";
+ private const string _AcDll = "acinerella.dll";
#endif
#if LINUX
diff --git a/Vocaluxe/Program.cs b/Vocaluxe/Program.cs
index 43964170..4da68bf2 100644
--- a/Vocaluxe/Program.cs
+++ b/Vocaluxe/Program.cs
@@ -52,6 +52,15 @@ namespace Vocaluxe
AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
#endif
AppDomain.CurrentDomain.AssemblyResolve += _AssemblyResolver;
+ COSFunctions.AddEnvironmentPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\"));
+ #if ARCH_X86
+ COSFunctions.AddEnvironmentPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\x86\\"));
+#endif
+#if ARCH_X64
+ COSFunctions.AddEnvironmentPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\x64\\"));
+#endif
+
+
// Close program if there is another instance running
if (!_EnsureSingleInstance())
return;
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index bc340b00..ee7a3871 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -1,4 +1,4 @@
-
+
DebugWin
@@ -31,6 +31,7 @@
1.0.0.%2a
false
true
+ 3d91144f
x86
@@ -143,80 +144,16 @@
WIN;ARCH_X64;INSTALLER
Off
-
-
- False
- ..\Output\x86\SlimDX.dll
- False
-
-
- ..\Output\x86\System.Data.SQLite.dll
- False
-
-
-
-
- ..\Output\x64\SlimDX.dll
- False
-
-
- ..\Output\x64\System.Data.SQLite.dll
- False
-
-
-
- False
- ..\Output\AForge.Video.dll
- False
-
-
- False
- ..\Output\AForge.Video.DirectShow.dll
- False
-
-
- ..\Output\Community.CsharpSqlite.dll
-
-
- True
- ..\Output\glib-sharp.dll
-
-
- False
- ..\Output\gstreamer-sharp.dll
-
-
- False
- ..\Output\Newtonsoft.Json.dll
-
-
- ..\Output\OpenTK.dll
-
-
- ..\Output\OpenTK.Compatibility.dll
-
-
- ..\Output\OpenTK.GLControl.dll
-
-
- False
- ..\Output\PortAudioSharp.dll
-
-
- False
- ..\Output\QRCoder.dll
-
-
+
-
@@ -297,8 +234,8 @@
-
-
+
+
@@ -399,6 +336,7 @@
PreserveNewest
+
@@ -536,14 +474,14 @@
- xcopy /E /D /Y "$(ProjectDir)\Website" "$(SolutionDir)\PhoneGap"
-powershell -command "$version = git describe --long; (Get-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js') | Foreach-Object {$_ -replace '(?<=var *matchingServerVersion * = *\")\w*(?=\" *;)', "$version"} | Set-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js'"
+ xcopy /E /D /Y "$(ProjectDir)\Website" "$(SolutionDir)\PhoneGap"
+powershell -command "if($Env:GIT_VERSION_TAG) {$version = $Env:GIT_VERSION_TAG;} else {$version = git describe --long;}(Get-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js') | Foreach-Object {$_ -replace '(?<=var *matchingServerVersion * = *\")\w*(?=\" *;)', "$version"} | Set-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js'"
powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?<=AssemblyInformationalVersion\()(.*)(?=\))', '\"GITVERSION\"'} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"
cp -ruT "$(ProjectDir)Website" "$(SolutionDir)/PhoneGap"
$(ProjectDir)Linux/Build/PostBuildEvent.sh $(ProjectDir)
- powershell -command "$version = git describe --long; (Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace 'GITVERSION', $version} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"
+ powershell -command "if($Env:GIT_VERSION_TAG) {$version = $Env:GIT_VERSION_TAG;} else {$version = git describe --long;} (Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace 'GITVERSION', $version} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"
$(ProjectDir)Linux/Build/PreBuildEvent.sh $(ProjectDir)