diff --git a/debian/kali-desktop-base.postinst b/debian/kali-desktop-base.postinst index 1fbb4076..87a9d2d6 100644 --- a/debian/kali-desktop-base.postinst +++ b/debian/kali-desktop-base.postinst @@ -30,13 +30,13 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remov # Desktop background alternatives update-alternatives --install \ /usr/share/images/desktop-base/desktop-background \ - desktop-background /usr/share/wallpapers/kaliLogo/contents/images/kali-logo-16x9.png 200 + desktop-background /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png 200 # Set up an alternative for the XML version of the background # (for GNOME) update-alternatives --install \ /usr/share/images/desktop-base/desktop-background.xml \ - desktop-background.xml /usr/share/wallpapers/kaliLogo/gnome-background.xml 200 + desktop-background.xml /usr/share/wallpapers/KaliLogo/gnome-background.xml 200 # Set up an alternative for the XML version of the lock screen # (for GNOME) diff --git a/share/backgrounds/kali/kali-blue-matrix.png b/share/backgrounds/kali/kali-blue-matrix.png index 22293f1b..f9d7e1f8 120000 --- a/share/backgrounds/kali/kali-blue-matrix.png +++ b/share/backgrounds/kali/kali-blue-matrix.png @@ -1 +1 @@ -/usr/share/wallpapers/KaliBlueMatrix/contents/images/kali-blue-matrix.png \ No newline at end of file +/usr/share/wallpapers/KaliBlueMatrix/contents/images/kali-blue-matrix-16x9.png \ No newline at end of file diff --git a/share/backgrounds/kali/kali-dark.png b/share/backgrounds/kali/kali-dark.png index 7dfd7717..03968151 120000 --- a/share/backgrounds/kali/kali-dark.png +++ b/share/backgrounds/kali/kali-dark.png @@ -1 +1 @@ -/usr/share/wallpapers/KaliBlueMatrix/contents/images/kali-dark-16x9.png \ No newline at end of file +/usr/share/wallpapers/KaliDark/contents/images/kali-dark-16x9.png \ No newline at end of file diff --git a/share/backgrounds/kali/kali-grid.png b/share/backgrounds/kali/kali-grid.png index a4ea99eb..17a79c55 120000 --- a/share/backgrounds/kali/kali-grid.png +++ b/share/backgrounds/kali/kali-grid.png @@ -1 +1 @@ -/usr/share/wallpapers/KaliGrid/contents/images/kali-grid.png \ No newline at end of file +/usr/share/wallpapers/KaliGrid/contents/images/kali-grid-16x9.png \ No newline at end of file diff --git a/share/backgrounds/kali/kali-rings.png b/share/backgrounds/kali/kali-rings.png index d906f55c..e61960cf 120000 --- a/share/backgrounds/kali/kali-rings.png +++ b/share/backgrounds/kali/kali-rings.png @@ -1 +1 @@ -/usr/share/wallpapers/KaliRings/contents/images/kali-rings.png \ No newline at end of file +/usr/share/wallpapers/KaliRings/contents/images/kali-rings-16x9.png \ No newline at end of file diff --git a/share/backgrounds/kali/kali-small-logo.png b/share/backgrounds/kali/kali-small-logo.png index b2a269ce..17236213 120000 --- a/share/backgrounds/kali/kali-small-logo.png +++ b/share/backgrounds/kali/kali-small-logo.png @@ -1 +1 @@ -/usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo.png \ No newline at end of file +/usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x9.png \ No newline at end of file diff --git a/share/backgrounds/kali/kali-strips.png b/share/backgrounds/kali/kali-strips.png index 4b332ed8..feec192f 120000 --- a/share/backgrounds/kali/kali-strips.png +++ b/share/backgrounds/kali/kali-strips.png @@ -1 +1 @@ -/usr/share/wallpapers/KaliStrips/contents/images/kali-strips.png \ No newline at end of file +/usr/share/wallpapers/KaliStrips/contents/images/kali-strips-16x9.png \ No newline at end of file diff --git a/share/backgrounds/kali/kali-trail.png b/share/backgrounds/kali/kali-trail.png index 77cca403..4a1cb638 120000 --- a/share/backgrounds/kali/kali-trail.png +++ b/share/backgrounds/kali/kali-trail.png @@ -1 +1 @@ -/usr/share/wallpapers/KaliTrail/contents/images/kali-trail.png \ No newline at end of file +/usr/share/wallpapers/KaliTrail/contents/images/kali-trail-16x9.png \ No newline at end of file diff --git a/share/gnome-background-properties/kali-backgrounds.xml b/share/gnome-background-properties/kali-backgrounds.xml index 8edfb153..97b90354 100644 --- a/share/gnome-background-properties/kali-backgrounds.xml +++ b/share/gnome-background-properties/kali-backgrounds.xml @@ -17,49 +17,49 @@ Kali Rings - /usr/share/wallpapers/KaliRings/contents/images/kali-rings.png + /usr/share/wallpapers/KaliRings/gnome-background.xml zoom #ffffff #000000 - Kali Black - /usr/share/wallpapers/KaliDark/contents/images/kali-dark.png + Kali Dark + /usr/share/wallpapers/KaliDark/contents/images/kali-dark-16x9.png zoom #ffffff #000000 Kali Blue Matrix - /usr/share/wallpapers/KaliBlueMatrix/contents/images/kali-blue-matrix.png + /usr/share/wallpapers/KaliBlueMatrix/contents/images/kali-blue-matrix-16x9.png zoom #ffffff #000000 Kali Grid - /usr/share/wallpapers/KaliGrid/contents/images/kali-grid.png + /usr/share/wallpapers/KaliGrid/contents/images/kali-grid-16x9.png zoom #ffffff #000000 Kali Small Logo - /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo.png + /usr/share/wallpapers/KaliSmallLogo/gnome-background.xml zoom #ffffff #000000 Kali Strips - /usr/share/wallpapers/KaliStrips/contents/images/kali-strips.png + /usr/share/wallpapers/KaliStrips/gnome-background.xml zoom #ffffff #000000 Kali KaliTrail - /usr/share/wallpapers/KaliTrail/contents/images/kali-trail.png + /usr/share/wallpapers/KaliTrail/contents/images/kali-trail-16x9.png zoom #ffffff #000000 diff --git a/share/wallpapers/KaliBlueMatrix/contents/images/kali-blue-matrix.png b/share/wallpapers/KaliBlueMatrix/contents/images/kali-blue-matrix-16x9.png similarity index 100% rename from share/wallpapers/KaliBlueMatrix/contents/images/kali-blue-matrix.png rename to share/wallpapers/KaliBlueMatrix/contents/images/kali-blue-matrix-16x9.png diff --git a/share/wallpapers/KaliDark/contents/images/kali-dark-16x9.png b/share/wallpapers/KaliDark/contents/images/kali-dark-16x9.png index faf1e21d..eccee7d2 100644 Binary files a/share/wallpapers/KaliDark/contents/images/kali-dark-16x9.png and b/share/wallpapers/KaliDark/contents/images/kali-dark-16x9.png differ diff --git a/share/wallpapers/KaliGrid/contents/images/kali-grid.png b/share/wallpapers/KaliGrid/contents/images/kali-grid-16x9.png similarity index 100% rename from share/wallpapers/KaliGrid/contents/images/kali-grid.png rename to share/wallpapers/KaliGrid/contents/images/kali-grid-16x9.png diff --git a/share/wallpapers/KaliLight/gnome-background.xml b/share/wallpapers/KaliLight/gnome-background.xml index 5aaf3ddd..4c1355e1 100644 --- a/share/wallpapers/KaliLight/gnome-background.xml +++ b/share/wallpapers/KaliLight/gnome-background.xml @@ -2,15 +2,15 @@ 8640000.0 - /usr/share/wallpapers/KaliLight/contents/imageskali-light-4x3.png - /usr/share/wallpapers/KaliLight/contents/imageskali-light-16x9.png - /usr/share/wallpapers/KaliLight/contents/imageskali-light-16x10.png - /usr/share/wallpapers/KaliLight/contents/imageskali-light-4x3.png - /usr/share/wallpapers/KaliLight/contents/imageskali-light-16x9.png - /usr/share/wallpapers/KaliLight/contents/imageskali-light-16x10.png - /usr/share/wallpapers/KaliLight/contents/imageskali-light-16x9.png - /usr/share/wallpapers/KaliLight/contents/imageskali-light-16x10.png - /usr/share/wallpapers/KaliLight/contents/imageskali-light-16x9.png + /usr/share/wallpapers/KaliLight/contents/images/kali-light-4x3.png + /usr/share/wallpapers/KaliLight/contents/images/kali-light-16x9.png + /usr/share/wallpapers/KaliLight/contents/images/kali-light-16x10.png + /usr/share/wallpapers/KaliLight/contents/images/kali-light-4x3.png + /usr/share/wallpapers/KaliLight/contents/images/kali-light-16x9.png + /usr/share/wallpapers/KaliLight/contents/images/kali-light-16x10.png + /usr/share/wallpapers/KaliLight/contents/images/kali-light-16x9.png + /usr/share/wallpapers/KaliLight/contents/images/kali-light-16x10.png + /usr/share/wallpapers/KaliLight/contents/images/kali-light-16x9.png diff --git a/share/wallpapers/KaliLogo/contents/images/kali-logo-16x10.png b/share/wallpapers/KaliLogo/contents/images/kali-logo-16x10.png index 1070dbb3..270068c8 100644 Binary files a/share/wallpapers/KaliLogo/contents/images/kali-logo-16x10.png and b/share/wallpapers/KaliLogo/contents/images/kali-logo-16x10.png differ diff --git a/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png b/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png index 442b65e1..e45ea4c3 100644 Binary files a/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png and b/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png differ diff --git a/share/wallpapers/KaliLogo/contents/images/kali-logo-4x3.png b/share/wallpapers/KaliLogo/contents/images/kali-logo-4x3.png index 6c0480a1..2e0e9263 100644 Binary files a/share/wallpapers/KaliLogo/contents/images/kali-logo-4x3.png and b/share/wallpapers/KaliLogo/contents/images/kali-logo-4x3.png differ diff --git a/share/wallpapers/KaliLogo/gnome-background.xml b/share/wallpapers/KaliLogo/gnome-background.xml index ff90c3c3..6f72c76e 100644 --- a/share/wallpapers/KaliLogo/gnome-background.xml +++ b/share/wallpapers/KaliLogo/gnome-background.xml @@ -2,15 +2,15 @@ 8640000.0 - /usr/share/wallpapers/KaliLight/contents/images/kali-logo-4x3.png - /usr/share/wallpapers/KaliLight/contents/images/kali-logo-16x9.png - /usr/share/wallpapers/KaliLight/contents/images/kali-logo-16x10.png - /usr/share/wallpapers/KaliLight/contents/images/kali-logo-4x3.png - /usr/share/wallpapers/KaliLight/contents/images/kali-logo-16x9.png - /usr/share/wallpapers/KaliLight/contents/images/kali-logo-16x10.png - /usr/share/wallpapers/KaliLight/contents/images/kali-logo-16x9.png - /usr/share/wallpapers/KaliLight/contents/images/kali-logo-16x10.png - /usr/share/wallpapers/KaliLight/contents/images/kali-logo-16x9.png + /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-4x3.png + /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png + /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x10.png + /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-4x3.png + /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png + /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x10.png + /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png + /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x10.png + /usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png diff --git a/share/wallpapers/KaliRings/contents/images/kali-rings-16x10.png b/share/wallpapers/KaliRings/contents/images/kali-rings-16x10.png new file mode 100644 index 00000000..19c32620 Binary files /dev/null and b/share/wallpapers/KaliRings/contents/images/kali-rings-16x10.png differ diff --git a/share/wallpapers/KaliRings/contents/images/kali-rings.png b/share/wallpapers/KaliRings/contents/images/kali-rings-16x9.png similarity index 100% rename from share/wallpapers/KaliRings/contents/images/kali-rings.png rename to share/wallpapers/KaliRings/contents/images/kali-rings-16x9.png diff --git a/share/wallpapers/KaliRings/contents/images/kali-rings-4x3.png b/share/wallpapers/KaliRings/contents/images/kali-rings-4x3.png new file mode 100644 index 00000000..a018566e Binary files /dev/null and b/share/wallpapers/KaliRings/contents/images/kali-rings-4x3.png differ diff --git a/share/wallpapers/KaliRings/gnome-background.xml b/share/wallpapers/KaliRings/gnome-background.xml new file mode 100644 index 00000000..afbfe1e6 --- /dev/null +++ b/share/wallpapers/KaliRings/gnome-background.xml @@ -0,0 +1,16 @@ + + + 8640000.0 + + /usr/share/wallpapers/KaliRings/contents/images/kali-rings-4x3.png + /usr/share/wallpapers/KaliRings/contents/images/kali-rings-16x9.png + /usr/share/wallpapers/KaliRings/contents/images/kali-rings-16x10.png + /usr/share/wallpapers/KaliRings/contents/images/kali-rings-4x3.png + /usr/share/wallpapers/KaliRings/contents/images/kali-rings-16x9.png + /usr/share/wallpapers/KaliRings/contents/images/kali-rings-16x10.png + /usr/share/wallpapers/KaliRings/contents/images/kali-rings-16x9.png + /usr/share/wallpapers/KaliRings/contents/images/kali-rings-16x10.png + /usr/share/wallpapers/KaliRings/contents/images/kali-rings-16x9.png + + + diff --git a/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x10.png b/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x10.png new file mode 100644 index 00000000..ce49bdab Binary files /dev/null and b/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x10.png differ diff --git a/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x9.png b/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x9.png new file mode 100644 index 00000000..83a32992 Binary files /dev/null and b/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x9.png differ diff --git a/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-4x3.png b/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-4x3.png new file mode 100644 index 00000000..e3e22a84 Binary files /dev/null and b/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-4x3.png differ diff --git a/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo.png b/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo.png deleted file mode 100644 index 8cb66b37..00000000 Binary files a/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo.png and /dev/null differ diff --git a/share/wallpapers/KaliSmallLogo/gnome-background.xml b/share/wallpapers/KaliSmallLogo/gnome-background.xml new file mode 100644 index 00000000..94749adc --- /dev/null +++ b/share/wallpapers/KaliSmallLogo/gnome-background.xml @@ -0,0 +1,16 @@ + + + 8640000.0 + + /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-4x3.png + /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x9.png + /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x10.png + /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-4x3.png + /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x9.png + /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x10.png + /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x9.png + /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x10.png + /usr/share/wallpapers/KaliSmallLogo/contents/images/kali-small-logo-16x9.png + + + diff --git a/share/wallpapers/KaliStrips/contents/images/kali-strips-16x10.png b/share/wallpapers/KaliStrips/contents/images/kali-strips-16x10.png new file mode 100644 index 00000000..8a3e39df Binary files /dev/null and b/share/wallpapers/KaliStrips/contents/images/kali-strips-16x10.png differ diff --git a/share/wallpapers/KaliStrips/contents/images/kali-strips-16x9.png b/share/wallpapers/KaliStrips/contents/images/kali-strips-16x9.png new file mode 100644 index 00000000..ce27416b Binary files /dev/null and b/share/wallpapers/KaliStrips/contents/images/kali-strips-16x9.png differ diff --git a/share/wallpapers/KaliStrips/contents/images/kali-strips-4x3.png b/share/wallpapers/KaliStrips/contents/images/kali-strips-4x3.png new file mode 100644 index 00000000..dc1f6f94 Binary files /dev/null and b/share/wallpapers/KaliStrips/contents/images/kali-strips-4x3.png differ diff --git a/share/wallpapers/KaliStrips/contents/images/kali-strips.png b/share/wallpapers/KaliStrips/contents/images/kali-strips.png deleted file mode 100644 index 62e0bfce..00000000 Binary files a/share/wallpapers/KaliStrips/contents/images/kali-strips.png and /dev/null differ diff --git a/share/wallpapers/KaliStrips/gnome-background.xml b/share/wallpapers/KaliStrips/gnome-background.xml new file mode 100644 index 00000000..43db32c1 --- /dev/null +++ b/share/wallpapers/KaliStrips/gnome-background.xml @@ -0,0 +1,16 @@ + + + 8640000.0 + + /usr/share/wallpapers/KaliStrips/contents/images/kali-strips-4x3.png + /usr/share/wallpapers/KaliStrips/contents/images/kali-strips-16x9.png + /usr/share/wallpapers/KaliStrips/contents/images/kali-strips-16x10.png + /usr/share/wallpapers/KaliStrips/contents/images/kali-strips-4x3.png + /usr/share/wallpapers/KaliStrips/contents/images/kali-strips-16x9.png + /usr/share/wallpapers/KaliStrips/contents/images/kali-strips-16x10.png + /usr/share/wallpapers/KaliStrips/contents/images/kali-strips-16x9.png + /usr/share/wallpapers/KaliStrips/contents/images/kali-strips-16x10.png + /usr/share/wallpapers/KaliStrips/contents/images/kali-strips-16x9.png + + + diff --git a/share/wallpapers/KaliTrail/contents/images/kali-trail.png b/share/wallpapers/KaliTrail/contents/images/kali-trail-16x9.png similarity index 100% rename from share/wallpapers/KaliTrail/contents/images/kali-trail.png rename to share/wallpapers/KaliTrail/contents/images/kali-trail-16x9.png diff --git a/src/backgrounds/kali-logo-16x10.svg b/src/backgrounds/kali-logo-16x10.svg new file mode 100644 index 00000000..f7f137c1 --- /dev/null +++ b/src/backgrounds/kali-logo-16x10.svg @@ -0,0 +1 @@ + diff --git a/src/backgrounds/kali-logo-16x9.svg b/src/backgrounds/kali-logo-16x9.svg new file mode 100644 index 00000000..80d83b06 --- /dev/null +++ b/src/backgrounds/kali-logo-16x9.svg @@ -0,0 +1 @@ + diff --git a/src/backgrounds/kali-logo-4x3.svg b/src/backgrounds/kali-logo-4x3.svg new file mode 100644 index 00000000..6800e37e --- /dev/null +++ b/src/backgrounds/kali-logo-4x3.svg @@ -0,0 +1 @@ + diff --git a/src/backgrounds/kali-logo.svg b/src/backgrounds/kali-logo.svg deleted file mode 100644 index 2c9ef388..00000000 --- a/src/backgrounds/kali-logo.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/backgrounds/kali-small-logo-16x10.svg b/src/backgrounds/kali-small-logo-16x10.svg new file mode 100644 index 00000000..d4b9349f --- /dev/null +++ b/src/backgrounds/kali-small-logo-16x10.svg @@ -0,0 +1 @@ + diff --git a/src/backgrounds/kali-small-logo-16x9.svg b/src/backgrounds/kali-small-logo-16x9.svg new file mode 100644 index 00000000..bae7aa31 --- /dev/null +++ b/src/backgrounds/kali-small-logo-16x9.svg @@ -0,0 +1 @@ + diff --git a/src/backgrounds/kali-small-logo-4x3.svg b/src/backgrounds/kali-small-logo-4x3.svg new file mode 100644 index 00000000..3f762cc2 --- /dev/null +++ b/src/backgrounds/kali-small-logo-4x3.svg @@ -0,0 +1 @@ + diff --git a/src/backgrounds/kali-small-logo.svg b/src/backgrounds/kali-small-logo.svg deleted file mode 100644 index 1d35d6e7..00000000 --- a/src/backgrounds/kali-small-logo.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/src/backgrounds/kali-strips-16x10.svg b/src/backgrounds/kali-strips-16x10.svg new file mode 100644 index 00000000..c399888e --- /dev/null +++ b/src/backgrounds/kali-strips-16x10.svg @@ -0,0 +1 @@ + diff --git a/src/backgrounds/kali-strips-4x3.svg b/src/backgrounds/kali-strips-4x3.svg new file mode 100644 index 00000000..806078f8 --- /dev/null +++ b/src/backgrounds/kali-strips-4x3.svg @@ -0,0 +1 @@ + diff --git a/src/backgrounds/kali-strips.svg b/src/backgrounds/kali-strips.svg index 8ba84d2f..2e8412ca 100644 --- a/src/backgrounds/kali-strips.svg +++ b/src/backgrounds/kali-strips.svg @@ -1,51 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/backgrounds/kali-trail.svg b/src/backgrounds/kali-trail.svg index 360f01be..8af41f6e 100644 --- a/src/backgrounds/kali-trail.svg +++ b/src/backgrounds/kali-trail.svg @@ -1,1061 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +