Merged Upstreamv1.0.0

- Merge branch 'master' of github.com:apheleia/solarc-theme
- Merge branch 'master' of github.com:horst3180/arc-theme

21 files changed, 21 insertions, 21 deletions

diff --git a/common/index.theme b/common/index.theme
index 219f5de..3c9c2b9 100644
--- a/common/index.theme
+++ b/common/index.theme
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=X-GNOME-Metatheme
-Name=Arc
+Name=SolArc
 Comment=A flat theme with transparent elements
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-GtkTheme=Arc
-MetacityTheme=Arc
+GtkTheme=SolArc
+MetacityTheme=SolArc
 IconTheme=gnome
 CursorTheme=DMZ-Black
 ButtonLayout=menu:minimize,maximize,close
diff --git a/common/index.theme-dark b/common/index.theme-dark
index 7f5fbfc..2257af9 100644
--- a/common/index.theme-dark
+++ b/common/index.theme-dark
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=X-GNOME-Metatheme
-Name=Arc-Dark
+Name=SolArc-Dark
 Comment=A flat theme with transparent elements
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-GtkTheme=Arc-Dark
-MetacityTheme=Arc-Dark
+GtkTheme=SolArc-Dark
+MetacityTheme=SolArc-Dark
 IconTheme=gnome
 CursorTheme=DMZ-Black
 ButtonLayout=menu:minimize,maximize,close
diff --git a/common/index.theme-darker b/common/index.theme-darker
index 7166a04..83226ed 100644
--- a/common/index.theme-darker
+++ b/common/index.theme-darker
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=X-GNOME-Metatheme
-Name=Arc-Darker
+Name=SolArc-Darker
 Comment=A flat theme with transparent elements
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-GtkTheme=Arc-Darker
-MetacityTheme=Arc-Darker
+GtkTheme=SolArc-Darker
+MetacityTheme=SolArc-Darker
 IconTheme=gnome
 CursorTheme=DMZ-Black
 ButtonLayout=menu:minimize,maximize,close
diff --git a/common/metacity-1/metacity-theme-1-dark.xml b/common/metacity-1/metacity-theme-1-dark.xml
index 6b680aa..eeab8f5 100644
--- a/common/metacity-1/metacity-theme-1-dark.xml
+++ b/common/metacity-1/metacity-theme-1-dark.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <metacity_theme>
 <info>
-	<name>Arc</name>
+	<name>SolArc</name>
 	<author>horst3180</author>
 	<copyright>horst3180</copyright>
 	<date>2015</date>
-	<description>Arc Metacity theme</description>
+	<description>SolArc Metacity theme</description>
 </info>
 
 <!-- meaningfull constants -->
diff --git a/common/metacity-1/metacity-theme-1.xml b/common/metacity-1/metacity-theme-1.xml
index a1d9b62..73a5253 100644
--- a/common/metacity-1/metacity-theme-1.xml
+++ b/common/metacity-1/metacity-theme-1.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <metacity_theme>
 <info>
-	<name>Arc</name>
+	<name>SolArc</name>
 	<author>horst3180</author>
 	<copyright>horst3180</copyright>
 	<date>2015</date>
-	<description>Arc Metacity theme</description>
+	<description>SolArc Metacity theme</description>
 </info>
 
 <!-- meaningfull constants -->
diff --git a/common/metacity-1/metacity-theme-2-dark.xml b/common/metacity-1/metacity-theme-2-dark.xml
index 6b680aa..eeab8f5 100644
--- a/common/metacity-1/metacity-theme-2-dark.xml
+++ b/common/metacity-1/metacity-theme-2-dark.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <metacity_theme>
 <info>
-	<name>Arc</name>
+	<name>SolArc</name>
 	<author>horst3180</author>
 	<copyright>horst3180</copyright>
 	<date>2015</date>
-	<description>Arc Metacity theme</description>
+	<description>SolArc Metacity theme</description>
 </info>
 
 <!-- meaningfull constants -->
diff --git a/common/metacity-1/metacity-theme-2.xml b/common/metacity-1/metacity-theme-2.xml
index a1d9b62..73a5253 100644
--- a/common/metacity-1/metacity-theme-2.xml
+++ b/common/metacity-1/metacity-theme-2.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <metacity_theme>
 <info>
-	<name>Arc</name>
+	<name>SolArc</name>
 	<author>horst3180</author>
 	<copyright>horst3180</copyright>
 	<date>2015</date>
-	<description>Arc Metacity theme</description>
+	<description>SolArc Metacity theme</description>
 </info>
 
 <!-- meaningfull constants -->
diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml
index 7d1b331..3d4fe72 100644
--- a/common/metacity-1/metacity-theme-3.xml
+++ b/common/metacity-1/metacity-theme-3.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <metacity_theme>
 <info>
-	<name>Arc</name>
+	<name>SolArc</name>
 	<author>horst3180</author>
 	<copyright>horst3180</copyright>
 	<date>2015</date>
-	<description>Arc Metacity theme</description>
+	<description>SolArc Metacity theme</description>
 </info>
 
 <!-- meaningfull constants -->
diff --git a/extra/Chrome/arc-dark-theme/images/theme_frame.png b/extra/Chrome/solarc-dark-theme/images/theme_frame.png
index ef5e128..ef5e128 100644
--- a/extra/Chrome/arc-dark-theme/images/theme_frame.png
+++ b/extra/Chrome/solarc-dark-theme/images/theme_frame.png
diff --git a/extra/Chrome/arc-dark-theme/images/theme_tab_background.png b/extra/Chrome/solarc-dark-theme/images/theme_tab_background.png
index 597b912..597b912 100644
--- a/extra/Chrome/arc-dark-theme/images/theme_tab_background.png
+++ b/extra/Chrome/solarc-dark-theme/images/theme_tab_background.png
diff --git a/extra/Chrome/arc-dark-theme/images/theme_toolbar.png b/extra/Chrome/solarc-dark-theme/images/theme_toolbar.png
index 3432a67..3432a67 100644
--- a/extra/Chrome/arc-dark-theme/images/theme_toolbar.png
+++ b/extra/Chrome/solarc-dark-theme/images/theme_toolbar.png
diff --git a/extra/Chrome/arc-dark-theme/manifest.json b/extra/Chrome/solarc-dark-theme/manifest.json
index 6c0a14f..6c0a14f 100644
--- a/extra/Chrome/arc-dark-theme/manifest.json
+++ b/extra/Chrome/solarc-dark-theme/manifest.json
diff --git a/extra/Chrome/arc-darker-theme/images/theme_frame.png b/extra/Chrome/solarc-darker-theme/images/theme_frame.png
index 8368110..8368110 100644
--- a/extra/Chrome/arc-darker-theme/images/theme_frame.png
+++ b/extra/Chrome/solarc-darker-theme/images/theme_frame.png
diff --git a/extra/Chrome/arc-darker-theme/images/theme_toolbar.png b/extra/Chrome/solarc-darker-theme/images/theme_toolbar.png
index ff91e1c..ff91e1c 100644
--- a/extra/Chrome/arc-darker-theme/images/theme_toolbar.png
+++ b/extra/Chrome/solarc-darker-theme/images/theme_toolbar.png
diff --git a/extra/Chrome/arc-darker-theme/manifest.json b/extra/Chrome/solarc-darker-theme/manifest.json
index f9e5413..f9e5413 100644
--- a/extra/Chrome/arc-darker-theme/manifest.json
+++ b/extra/Chrome/solarc-darker-theme/manifest.json
diff --git a/extra/Chrome/arc-theme.crx b/extra/Chrome/solarc-theme.crx
index f3fc5b0..f3fc5b0 100644
--- a/extra/Chrome/arc-theme.crx
+++ b/extra/Chrome/solarc-theme.crx
diff --git a/extra/Chrome/arc-theme/images/theme_frame.png b/extra/Chrome/solarc-theme/images/theme_frame.png
index 48f841f..48f841f 100644
--- a/extra/Chrome/arc-theme/images/theme_frame.png
+++ b/extra/Chrome/solarc-theme/images/theme_frame.png
diff --git a/extra/Chrome/arc-theme/images/theme_toolbar.png b/extra/Chrome/solarc-theme/images/theme_toolbar.png
index ff91e1c..ff91e1c 100644
--- a/extra/Chrome/arc-theme/images/theme_toolbar.png
+++ b/extra/Chrome/solarc-theme/images/theme_toolbar.png
diff --git a/extra/Chrome/arc-theme/manifest.json b/extra/Chrome/solarc-theme/manifest.json
index fb8b6f4..fb8b6f4 100644
--- a/extra/Chrome/arc-theme/manifest.json
+++ b/extra/Chrome/solarc-theme/manifest.json
diff --git a/extra/Makefile.am b/extra/Makefile.am
index a21d248..0703ef7 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -1,2 +1,2 @@
 EXTRA_DIST = $(srcdir)/Chrome \
-	     $(srcdir)/Arc-Plank
+	     $(srcdir)/SolArc-Plank
diff --git a/extra/Arc-Plank/dock.theme b/extra/SolArc-Plank/dock.theme
index 4c77c81..2e0cc55 100644
--- a/extra/Arc-Plank/dock.theme
+++ b/extra/SolArc-Plank/dock.theme
@@ -1,4 +1,4 @@
-# Arc theme for Plank
+# SolArc theme for Plank
 # Author: Horst3180
 # Adapted from the default Plank theme